Makefile now works on osx
Fixed xcodeproj