getting angular-ui-bootstrap set up
Merge branch 'master' of github.com:simshanith/compute-midwest-2014

Conflicts:
	public/assets/scripts/main.pkgd.js
	public/assets/styles/main.css
	public/index.html
	public/views/map.html
	public/views/splash.html