init
hash class
hash class
Merge branch 'develop' into master-github

Conflicts:
	main.py
hash class