fghfcgfg
Merge branch 'master' of https://github.com/TrulsHaraldsson/Helix.git

Conflicts:
	Helix/src/com/Main.java
Merge branch 'master' of https://github.com/TrulsHaraldsson/Helix.git
Merge branch 'master' of https://github.com/TrulsHaraldsson/Helix.git

Conflicts:
	Helix/src/com/Main.java