update
Merge branch 'master' of https://github.com/darrenlin9/MyRailsApp

Conflicts:
	README.rdoc