Merge branch 'master' of https://github.com/murphmar/youat

Conflicts:
	Index.html
Fix