Problem solved: mac does not say 'make' and 'make run' anymore
Merge branch 'master' of github.com:nusic/3D-Datorgrafik_projekt