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

Conflicts:
	MasterPage.master.cs
Gusia commit
pk
gusia
asd