basic html stuffs
Merge branch 'master' of https://github.com/omar2112/343final

Conflicts:
	.idea/workspace.xml