Removed Conflict
Merge pull request #3 from emoacht/develop

Removed Conflict