Merge branch 'master' of https://github.com/kaitlinhuben/fourpeople into mandy
Merge branch 'master' of https://github.com/kaitlinhuben/fourpeople into mandy
added UserManual
Merge branch 'mandy' of https://github.com/kaitlinhuben/fourpeople into mandy-merge
Merge pull request #72 from kaitlinhuben/mandy-merge

Mandy merge