Init commit
Merge branch 'master' of github.com:LoftCoders/Samply-Rails-App

Conflicts:
	.gitignore