you guys will love this maybe.
Merge branch 'master' of https://github.com/omar2112/343final

Conflicts:
	index.html