Revert "Merge branch 'master' of https://github.com/zacmontague/DMApp"

This reverts commit e0f82257d6e12082fcc5589768dcce14598439a8, reversing
changes made to 1925ede48b79aa22da4f3a4f464bf5638289b85b.
Revert "Revert dd368bb..5b0c857"

This reverts commit 1925ede48b79aa22da4f3a4f464bf5638289b85b.