Merge pull request #4 from socialize/chore/testing

Chore/testing
Merge branch 'master' of github.com:/socialize/aphrodite into COD-3