going to delete this branch and see if it knows I have a commit
Merge branch 'dev'
a round of blockquotes for everyone
no idea why i had conflicts