first commit
Merge branch 'master' of https://github.com/ryphon/RailsBasic

Conflicts:
	.gitignore