Minor formatting changes
Switch from showdown to marked
Pre-merge commit
Merge branch 'develop'