Update README.md
Merge branch 'master' of https://github.com/TeamHellman/5DV118.git
king
Merge branch 'master' of https://github.com/TeamHellman/5DV118.git
Merge branch 'master' of https://github.com/TeamHellman/5DV118.git

Conflicts:
	lab1-5DV118/src/lab1.java
Merge branch 'master' of https://github.com/TeamHellman/5DV118.git

Conflicts:
	lab1-5DV118/src/boriz.txt