Committing result of a day of pair programming - all test cases pass
Merge branch 'master' of https://github.com/vermagav/gtaosp4

Conflicts:
	Makefile