fixed pages
Merge branch 'master' of https://github.com/TylerGarlick/launchpad

Conflicts:
	.bowerrc
	app.js
	config/router.js
	public/libs/bootstrap/assets/js/holder.js
	public/stylesheets/style.less
	views/index.ejs
accounts work