init commit
Merge branch 'master' of github.com:arcooverbeek/railshosting

Conflicts:
	.gitignore