sorta works
Merge branch 'master' of https://github.com/enah/graphics-assignment-1