first commit
Merge branch 'master' of https://github.com/gravion/ComputergrafikSS14

Conflicts:
	README.md