Added Adam's image upload
Merge branch 'master' of https://github.com/quinlijohn/waterloop-api