Fixed Makefile
Merge branch 'master' of https://github.com/renegadeboss/CyPRUSclient

Conflicts:
	src/Makefile

Merged makefile