playing with drag and drop
Merge branch 'master' of https://github.com/kaitlinhuben/fourpeople into mandy
Merge branch 'master' of https://github.com/kaitlinhuben/fourpeople into mandy
Merge branch 'master' of https://github.com/kaitlinhuben/fourpeople into mandy
Merge branch 'master' of https://github.com/kaitlinhuben/fourpeople into mandy
added overlap function
fixed merge conflicts
Merge pull request #36 from kaitlinhuben/mandy

Mandy