Issue 8 resolve merge conflict#37

Karl-Sue merged 10 commits intoissue-8-Individual_art_pagescodersforcauses/game-dev:issue-8-Individual_art_pagesfrom

issue-8-resolve-merge-conflictcodersforcauses/game-dev:issue-8-resolve-merge-conflictCopy head branch name to clipboard