initial commit for my rails app
cranked up the readme file to make more sense
fix conflicts on master