Fixed bootstrap change
Fixed error in CSS that didn't put navbar ul all the way left
Added padding to top so we could display text. Whoops
Merge branch 'master' of heroku.com:patrickviolette

Conflicts:
	mysite/settings.pyc
	mysite/urls.pyc
Modified git ignore
Got venv the f out of the repo
Fixed a typo in html link