apps
Merge branch 'master' of github.com:loveni/sandbox

Conflicts:
	src/main/java/name/loveni/sandbox/App.java