Initial commit
Merge github.com:5kr1p7/myrails3app

Conflicts:
	.gitignore