favorites table, model, controller, and button added
fixed associations in user and version models and controller in favorites
fixed merge conflict
Merge branch 'master' into favorites_table
fixes merge conflict
Merge pull request #41 from dhouk24/favorites_table

Favorites table