deletion
Merge branch 'master' of https://github.com/peoplespete/moon
Merge branch 'master' of https://github.com/peoplespete/moon
a bit of a table
resolved conflickts
resolved
one tabular finished
main article paragraph complete
resolve merge conflicts
continue to resolve merge conflict