Blank rails 4 project
all tests passing with minimal model
Fix merge conflict