initial commit
Initial commit 2
Improve the README
Merge branch 'master' of https://github.com/kdabrowski/sample_app

Conflicts:
	.rspec
	Gemfile
	Gemfile.lock
	config/secrets.yml
	spec/spec_helper.rb