added navbar and container
changed content
added sidebar and related styles
finished bootstrap style layout
Merge branch 'master' into bootstrap

Conflicts:
	css/bootstrap/bootstrap.css
	css/main.css
	css/main.sass
	index.html
cleaned up sass a bit