git version control issue
Merge branch 'master' of https://github.com/gcleveland/omrails