ADDED paperclip config
ADDED photo upload functionality
Merge branch 'photo-upload' of github.com:Simon245/grasshopper into Simon245-photo-upload

RESOLVED conflicts in index.html.slim and MOVED rails template to indexTemplate.html.slim
UPDATED site controller & routes for temporary index_template action
Merge branch 'master' of github.com:josephktcheung/grasshopper

RESOLVED Conflicts in app/controllers/users_controller.rb