Någon slags ändring.
Merge branch 'master' of https://github.com/oskarabrahamsson/Trainspotting_I

Conflicts:
	Lab1.java