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

Conflicts:
	index.html