merging?
Merge branch 'master' of https://github.com/lmjackso/forensics
my files
adding hachoir test again
added colors
updating some javascript