main page layout
Merge branch 'master' of https://github.com/ElliotSchmelliot/CardSwapr

Conflicts:
	about.html
	css/styles.css