Initial commit
Merge remote-tracking branch 'github/master'

Conflicts:
	src/com/conorgriffin/utils/HashGenerator.java