updated schema.rb
pulled new changes
Merge branch 'master' of https://github.com/Rockster160/Capstone into backgrounds
Merge branch 'backgrounds'
fake commit
Merge branch 'master' of https://github.com/Rockster160/Capstone into backgrounds
paperclip
changed background image to game_hub.jpg but didn't like. Changed back to gamehub.png
new changes
fixed errors
added GH favicon.ico to title bar
removed favicon from stylesheets
avatars doneish
Merge pull request #2 from Rockster160/backgrounds

Title and favicon to tab
Merge branch 'master' of github.com:Rockster160/Capstone into carefulmerge
Merged Erik's changes.
Solved merge conflicts from Preston's branch.
Fixed search to include more results, made favorites on user page more dynamic.
Finished search listing page- made it adjustable.
New coin image, rotates. Made font smaller to prevent page break.