Merge pull request #23 from laurenfazah/master

Popular and Recent showing on homepage. Uploads working.
Merge pull request #24 from laurenfazah/master

Styling is essentially complete
changes to index and app.js
merge conflicts fixed
Merge pull request #25 from billy1339/master

merg
total likes showing per pic