finished most migrations, will work on more later
Merge branch 'master' into fixing_links
passing tests\!
fix controllers
mostly changes for counter logic
fixed initial zoom
Merge pull request #79 from kdoyne/animation

fixed initial zoom
js assets precompile
changed prod.rb
everything seems to be working, I also cleaned up the files and removed the counter completely
added new models, server side counting, fixed, addded, and passed new tests, and cleaned up codebase
Merge pull request #80 from kevinmcalear/fixing_links

Fixing links
fixed user show page
Merge pull request #81 from kdoyne/animation

fixed user show page
refactored find photo method
Merge pull request #82 from cah13/photo-refactor

refactored find photo method
refactored code, fixed bug when clicking from user show page
fixed merge conflicts