Trying to commit the project again.
Merge branch 'master' of https://github.com/julianbutsa/OOSproject.git

Conflicts:
	.project