dummy
dummy
Merge branch 'master' of https://github.com/aozarov/git-demo

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs
work in progress