minimal changes
Merge branch 'master' of https://github.com/JamalMarques/BsktAssistant