commit
Merge branch 'master' of https://github.com/tmk1908/eLearning

Conflicts:
	App_Data/ASPNETDB.MDF
	App_Data/aspnetdb_log.ldf
	MasterPage.master.cs
	MasterPage.master.orig
	Nowy dokument tekstowy.txt
	login.aspx.cs
	user/Default.aspx
	web.config