Init commit
Merge branch 'master' of github.com:bmoeskau/rails-test

Conflicts:
	README.md