0.1.5 Rewrote rendering to include active layering
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
0.1.5 Moved graphics code around, added Scene
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml