Cha-cha-cha-cha-chaaanggeessss
Merge branch 'master' of github.com:scottferg/MC-Map-Uploader

Conflicts:
	main.go
Removed proxy