Merge pull request #26 from laurenfazah/master

total likes showing per pic!
Merge pull request #28 from laurenfazah/master

Merged conflicts
commitiong for gh pages
added a template
Merge pull request #29 from laurenfazah/master

added search bar back in, working out click voting, other tweaks
fixed minor bug in one of the tempaltes
image rendering on uploading works
directions on create image set
fixed merge confilcts:
fixed merging problems and added serach bar
Merge pull request #30 from billy1339/master

render pics real time and search bar
Merge branch 'master' into gh-pages
minor changes to instructions
Merge pull request #31 from billy1339/master

minor changes to instructions
grammar change
Merge branch 'gh-pages'
Merge pull request #32 from billy1339/master

grammar fix
hover to change opacity
Merge pull request #33 from billy1339/master

hover to change opacity some refactoring
targeted all pictures, ready for post request for likes