initial commit
Merge branch 'master' of https://github.com/ashiina/rails-demo-app

Conflicts:
	.gitignore