initial commit from local
Merge branch 'master' of github.com:JordanAMeyer/Marked
initial merge with local