Small change2
Change applied to app
Should be a 2
This should be a 3
Merging fix for app

Conflicts:
	test-git/src/main/java/se/loaf/App.java
This should be a 4
Fix for app 4
ignore iml files