init project
Merge branch 'master' of github.com:diguage/Rails4TutorialWithSlim

Conflicts:
	.gitignore