Init
Merge branch 'master' of github.com:theodowling/JQuery-file-Uploader-test

Conflicts:
	.gitignore