Update
Merge branch 'master' of https://github.com/JohnOfTheWater/RoR

Conflicts:
	README.md