Revert 95531b6..74a4c66

This rolls back to commit 95531b68e48484fa865fca6b52870d64201617c0.
Revert "Revert 95531b6..74a4c66"

This reverts commit bf2294188044e312f1fda29707246606d8186878.
Merge branch 'master' of https://github.com/moreyw/DMS-Project