Fixed upload bug

Created popup and datepicker works
merge conflict
upload should work now
asdfMerge branch 'master' of https://github.com/anselon/EECS394

Conflicts:
	index.html
	upload.html