Resolved conflicts
Merge branch 'master' of https://github.com/joinee/Force-of-Elementals