Swapped out elements making them us HTML5. Fixes #190
Removed unneeded ID's. Associated with #189
Removed more unneeded ids
Merge branch 'dev' into html5-elements

Conflicts:
	index.html