Merge pull request #11 from ayaigame/develop

Merge Develop into Master
Merge remote-tracking branch 'origin' into develop
Merge branch 'develop' of github.com:ayaigame/ayai-frontend into develop