Initial commit
Merge github.com:DougRoyer/sample_app

Conflicts:
	README.md
Added rspec