at end of first project assignment
Merge branch 'checkin1' into checkin-first
checkin1 complete
Merge branch 'checkin1' of https://github.com/alnelson19/jquery-streetfighter into gh-pages

Conflicts:
	css/main.css
	main.html
1-commit