Merge remote-tracking branch 'HackathonStarter/master'

Conflicts:
	.gitignore
	.travis.yml
	README.md
	app.js
	config/passport.js
	config/secrets.js
	controllers/api.js
	controllers/home.js
	controllers/user.js
	models/User.js
	package.json
	public/css/lib/bootstrap/alerts.less
	public/css/lib/bootstrap/badges.less
	public/css/lib/bootstrap/bootstrap.less
	public/css/lib/bootstrap/breadcrumbs.less
	public/css/lib/bootstrap/button-groups.less
	public/css/lib/bootstrap/buttons.less
	public/css/lib/bootstrap/carousel.less
	public/css/lib/bootstrap/close.less
	public/css/lib/bootstrap/code.less
	public/css/lib/bootstrap/component-animations.less
	public/css/lib/bootstrap/dropdowns.less
	public/css/lib/bootstrap/forms.less
	public/css/lib/bootstrap/glyphicons.less
	public/css/lib/bootstrap/grid.less
	public/css/lib/bootstrap/input-groups.less
	public/css/lib/bootstrap/jumbotron.less
	public/css/lib/bootstrap/labels.less
	public/css/lib/bootstrap/list-group.less
	public/css/lib/bootstrap/media.less
	public/css/lib/bootstrap/mixins.less
	public/css/lib/bootstrap/modals.less
	public/css/lib/bootstrap/navbar.less
	public/css/lib/bootstrap/navs.less
	public/css/lib/bootstrap/normalize.less
	public/css/lib/bootstrap/pager.less
	public/css/lib/bootstrap/pagination.less
	public/css/lib/bootstrap/panels.less
	public/css/lib/bootstrap/popovers.less
	public/css/lib/bootstrap/print.less
	public/css/lib/bootstrap/progress-bars.less
	public/css/lib/bootstrap/responsive-utilities.less
	public/css/lib/bootstrap/scaffolding.less
	public/css/lib/bootstrap/tables.less
	public/css/lib/bootstrap/theme.less
	public/css/lib/bootstrap/thumbnails.less
	public/css/lib/bootstrap/tooltip.less
	public/css/lib/bootstrap/type.less
	public/css/lib/bootstrap/utilities.less
	public/css/lib/bootstrap/variables.less
	public/css/lib/bootstrap/wells.less
	public/css/lib/font-awesome.min.css
	public/css/styles.less
	public/css/themes/default.less
	public/css/themes/flatly.less
	public/css/themes/ios7.less
	public/fonts/fontawesome-webfont.svg
	public/js/application.js
	public/js/lib/bootstrap.min.js
	test/app.js
	views/account/forgot.jade
	views/account/login.jade
	views/account/profile.jade
	views/account/reset.jade
	views/account/signup.jade
	views/home.jade
	views/layout.jade
	views/partials/flash.jade
	views/partials/footer.jade