Comments:
Merge branch 'dev' of https://github.com/AaronMcMurter/petphoto into dev
merging things