working on file upload
nothing really
commit for branch
image upload working
Merge branch 'upload'

Conflicts:
	app/scripts/controllers.js