richard3
Merge branch 'master' of https://github.com/tesorieror/sample.git

Conflicts:
	Sample/src/sample/Application.java