Fixing Merge Conflict
Merge pull request #3 from srophe/Group-Meeting-August-12

Fixing Merge Conflict