Edited navigation
Merge branch 'master' of https://github.com/felixmueller1989/glf_projekt