Uploading file working

File uploading is working. Hopefully JSON object works as a parameter
on index.html
Merge branch 'master' of https://github.com/HTMLThorHolland/HTMLThor

Conflicts:
	Website/index.html
	Website/upload2.jsp
Weirdest commit

Just fixing shit