Bootstrap changes

Core CSS & HTML
Merge branch 'master' of https://github.com/richmoh/hackference2014

Conflicts:
	public/.DS_Store
	public/views/home.html