Using markdown, updated single page app
Fixed merge conflicts
Merge branch 'danielpquinn-master'
Merge branch 'master' of https://github.com/dtrierweiler19/dtrierweiler19.github.io