1st commit
Merge branch 'master' of github.com:firebrick26/image_uploader

Conflicts:
	.gitignore