This commit actually contains code
Merge branch 'master' of https://github.com/36mbMonster/Dean-s-Assist-2