Hash generation from file
Merge branch 'master' into fix_html_paths

Conflicts:
	myRuby.rb