First commit
Merge branch 'master' of https://github.com/iman89/rails

Conflicts:
	.gitignore