Marys tasks
Merge branch 'master' of https://github.com/FreakyMaryk/JBGC