work in progress
Merge branch 'master' of https://github.com/rvrtex/ProfileJavaThree

Conflicts:
	.gitignore