stash
Merge branch 'master' of https://github.com/dillondrenzek/dm2
i'm trying to merge
Merge branch 'master' of https://github.com/dillondrenzek/dm2
syncing with recent
lab7 finished, lab 8 start