makefile now with pull
Merge branch 'master' of https://github.com/jakob-r/tudo_enviroment
small changes