database schema example
Last changes
Merge branch 'master' of https://github.com/gabriel128/sample_app into sign-up
Merge branch 'sign-up' of https://github.com/gabriel128/sample_app into sign-up

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/controllers/users_controller.rb
	app/views/users/SHOW.erb
	config/routes.rb