add/removed with new index/style file
Merge branch 'master' of https://github.com/jarmstrong2/csc309-A1

Conflicts:
	index.html
	screen-style.css