almost
Merge branch 'master' of https://github.com/mateuszherczka/Lab5

Conflicts:
	Browser/src/userInteraction/Controller.java
	Browser/src/userInteraction/View.java