Initial commit
Merge branch 'master' of github.com:Archimidis/rails-playground

Conflicts:
	.gitignore