Project 1 UI
Merge branch 'master' of https://github.com/Trayus/csc344

Conflicts:
	project1/code.js
	project1/index.html
project 2
Merge branch 'master' of https://github.com/Trayus/csc344