merging with develop branch
fixed merge conflicts
preparing for merge with group_stuff
fixed merge conflicts
preparing for merge
fixing merge conflicts
preparing for merge
fixed merge conflicts
fixed merge conflicts
fixed merge conflicts
preparing for merge
fixed merge conflicts
fixed merge conflicts
fixed default image problem by adding media folder
Merge pull request #11 from JohannaMW/group_stuff

Group stuff
solve conflict