Added Groups

Fixes #20
Merge pull request #26 from kenshinthebattosai/working

Added Groups