initial commit
Merge branch 'master' of https://github.com/sebastian1118/javademo

Conflicts:
	.gitignore