Pretty pretty
Merge branch 'master' of https://github.com/realcore/demo

Conflicts:
	src/no/demo/DemoMain.java