no message
Merge branch 'master' of https://github.com/IntanityCraft/hellogithub

Conflicts:
	src/com/example/hello/HelloWorld.java