Initial Rails commit
Merge branch 'master' of https://github.com/robinsonj/CSC667project