Börjat på kap 5
Merge branch 'master' of https://github.com/MrLarssonJr/Programmering-2

Conflicts:
	Programmering 2/src/ch3/e7/Math.java
	Programmering 2/src/ch3/e7/main.java