mvc v1
com
MVC FULLL
Merge branch 'master' of https://github.com/Filson14/Projekt-Harmonogramowanie

Conflicts:
	main.cpp