minor html changes
reolving merge conflict

Merge branch 'master' of https://github.com/thinktt/enigmaX

Conflicts:
	enigmax.html