derp
Merge branch 'master' of https://github.com/npfitz/ImageCollab

Conflicts:
	api/controllers/ImageController.js