Initial commit
Delete README.md
New files
Merge remote-tracking branch 'origin/master' into newlocal

Conflicts:
	.classpath
	.gitignore