Added file uploading
Merge remote-tracking branch 'origin/fileupload'

Conflicts:
	routes/index.js