Merge pull request #1 from Gells/Steph

Steph
Added side bar and main.css file
Merge branch 'Linda'

Conflicts:
	index.html
Merge branch 'master' of https://github.com/Gells/Hack-the-North

Conflicts:
	index.html
Merge branch 'Angela'

Conflicts:
	bootstrap.css
	index.html