Initial commit
Merge branch 'master' of github.com:goys/sample_app

Conflicts:
	.gitignore
	.q²pec
	Gemfile
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/layouts/application.html.erb
	config/application.rb
	config/database.yml
	config/initializers/secret_token.rb
	config/routes.rb
	spec/spec_helper.rb