Finish user signup
Add SSL in production
Merge branch 'master' of github.com:ehansh/sample_app

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/layouts/application.html.erb
Finish sign in, few days late due to reading incomprehension
fixing broken CSS
partials, and controllers, and helpers OH MY
Merge branch 'master' of github.com:ehansh/sample_app

Conflicts:
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb
removed news from everything, it's dead jim.
removing public news...again
Merge branch 'master' of github.com:ehansh/bootstrapExample