first commit
Merge branch 'master' of https://github.com/anupvarghese/railssampleapp

Conflicts:
	README.md