ML: majority of testing done on local machines
Merge branch 'master' of https://github.com/mlaterman/snapgram