Quad Generation
Merge branch 'denny' of https://github.com/Madsim/Drole into denny

Conflicts:
	Drole1.5/src/drole/Main.java