resolved #48, rumorgenerator is doneish
Merge branch 'develop' into feature/RumorGenerator
Merge branch 'feature/RumorGenerator' into develop