Merge branch 'master' of https://github.com/kaitlinhuben/fourpeople into mandy
Merge branch 'master' of https://github.com/kaitlinhuben/fourpeople into mandy
Merge pull request #70 from kaitlinhuben/kh-edits

Bugfix: remove red on delete overlap
added UserManual
Merge branch 'mandy' of https://github.com/kaitlinhuben/fourpeople into mandy-merge
Merge pull request #72 from kaitlinhuben/mandy-merge

Mandy merge
Added help page