Merge pull request #3 from GiacoPalma/feature

la till string
SAM
Sam
Sam
Sam was here
Sam was here
Sam was here
Sam was here
Merge branch 'feature' of github.com:GiacoPalma/AlmhultFlyg into feature

Conflicts:
	src/MainClass.java
Merge branch 'feature' of github.com:GiacoPalma/AlmhultFlyg into feature