Merge branch 'feature/28-markdown' into develop
Merge branch 'develop' of github.com:SamStudio8/triage into develop