magic
MAGICMerge branch 'master' of github.com:Ebraegel/test

Conflicts:
	testing.java