4prax fix
Merge branch 'master' of https://github.com/Slicey4/homework_3

Conflicts:
	version.properties