Initial commit
Improve the README
Finish static pages
Finish layout and routes
Merge branch 'master' of https://github.com/armandosanchez-4th/sample_app into modeling-users

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/layouts/application.html.erb
	bin/bundle
	bin/rails
	bin/rake
	config/application.rb
	config/routes.rb
Make a basic user model (including secure password)
Chapter 8