fileupload
Merge branch 'master' of https://github.com/tomaszszczerba/choose

Conflicts:
	Choose.Api/bin/Choose.Api.dll
	Choose.Api/bin/Choose.Api.pdb
	Choose.Api/obj/Debug/Choose.Api.csproj.FileListAbsolute.txt
	Choose.Api/obj/Debug/Choose.Api.dll
	Choose.Api/obj/Debug/Choose.Api.pdb
	Choose/app/index.html
	Choose/app/views/ask.html