t
Merge branch 'master' of https://github.com/rtoip91/Aplikacje-internetowe-projekt

Conflicts:
	Mpi_web/Mpi_web.v11.suo
	Mpi_web/Mpi_web/Users/Tasks.aspx
	Mpi_web/Mpi_web/bin/Mpi_web.dll
	Mpi_web/Mpi_web/bin/Mpi_web.pdb
	Mpi_web/Mpi_web/obj/Release/Mpi_web.dll
	Mpi_web/Mpi_web/obj/Release/Mpi_web.pdb
Merge branch 'master' of https://github.com/rtoip91/Aplikacje-internetowe-projekt

Conflicts:
	Mpi_web/Mpi_web.v11.suo
	Mpi_web/Mpi_web/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache