preferences
Merge branch 'master' of https://github.com/SimonHylander/Maven-Compiler

Conflicts:
	src/com/shy/application/Main.java