default rails app
Merge branch 'master' of github.com:michaelirey/DataConflict