removing .DS_Store
merging
delete group modal box added
erge changes
changed merged
Merge pull request #32 from hoongman/master

merged changes from Keir