wsoifjos
Merge branch 'master' of https://github.com/MarK9992/mishagile

Conflicts:
	src/main/java/view/View.java