Merge branch 'root6' of https://github.com/DRAGON-Collaboration/analyzer into root6

Author: Devin Connolly

.gitignore

@@ -29,6 +29,8 @@ lib/*.dsym
 lib/.*
 lib/*.rootmap
 lib/*.pcm
+lib/rootbeer
+lib/rootana
 .nfs*
 test.xml
 examples/*.d