generated static page controller with home and help
made static pages
generated user model
added password colum to user
added user controller
added bourbon gems
project mvc added
Merge branch 'home-page'
signup page and gem bcrypt
mystery field deleted
delt with conflict
corrected application file
Merge branch 'home-page'
users
fixed private
.
Merge branch 'project_mvc'

Conflicts:
	config/routes.rb
	db/schema.rb
fixed?
merged projects and users
working through bourbon
users