#79 merge entity and circle fragment shaders
Merge pull request #80 from andystanton/merge-aabb-circle-frags

#79 merge entity and circle fragment shaders