Update
Merge branch 'master' of https://github.com/CaptainMack/Node-Image-Upload

Conflicts:
	.gitignore