c
Merge branch 'master' of github.com:nikolai80/MyStudiRepo

Conflicts:
	ContosoUniversity/ContosoUniversity.v11.suo