first commit
Merge branch 'master' of github.com:siddhartham/rails-4-test

Conflicts:
	.gitignore