stuff
Merge branch 'master' of https://github.com/justayak/computerGrafik_2014

Conflicts:
	src/aufgabe25/AliasingFrame.java
Add grid stuff