fixed my github
Merge branch 'master' of https://github.com/teamtwenty/Lab-4

Conflicts:
	Lab-4/Lab-4/makefile