Finish layout and routes
Make a basic User model (including secure passwords)
Make a basic User model (including secure passwords)
Merge branch 'master' of https://github.com/tanquyvt/sample_app

Conflicts:
	.DS_Store
	Gemfile
	Gemfile.lock
	app/.DS_Store
	app/assets/javascripts/static_pages.js.coffee
	app/assets/javascripts/users.js.coffee
	app/assets/stylesheets/custom.css.scss
	app/assets/stylesheets/static_pages.css.scss
	app/assets/stylesheets/users.css.scss
	app/controllers/static_pages_controller.rb
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/helpers/static_pages_helper.rb
	app/helpers/users_helper.rb
	app/views/.DS_Store
	app/views/layouts/.DS_Store
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb
	app/views/layouts/_shim.html.erb
	app/views/layouts/application.html.erb
	app/views/static_pages/.DS_Store
	app/views/static_pages/about.html.erb
	app/views/static_pages/contact.html.erb
	app/views/static_pages/help.html.erb
	app/views/static_pages/home.html.erb
	app/views/users/new.html.erb
	config/routes.rb
	db/schema.rb
	spec/requests/static_pages_spec.rb
	spec/requests/user_pages_spec.rb
	spec/support/utilities.rb