added id for some html stuff
Merge branch 'master' of https://github.com/omar2112/343final