jeee
Merge branch 'master' of https://github.com/WahlKri/ChultsiExercise-1

Conflicts:
	.idea/workspace.xml
Merge pull request #2 from jultsi/master

jeee