created tables but still needs to rake db migrate
Merge branch 'master' of github.com:michaelsedits/project-rails into tables