Initial commit basic datamodel and rails setup
initial merge with origin