grrrrrrr 04.12.2013
Merge branch 'New' of https://github.com/Nox1993/Pit13grp6/