Add initial attempt at modeling margarita lamp; EdgemonAssignment.ai
Merge branch 'master' of https://github.com/chirs/media2