ble
Merge branch 'master' of https://github.com/geirmj11/ARTI-Prog2

Conflicts:
	dist/Jon Jonsson_lab1.jar

	deleted:    dist/Jon Jonsson_lab1.jar
	modified:   src/Main.java