my changes
Merge branch 'master' of https://github.com/justayak/computerGrafik_2014
wow some shit really works...