Cancel conflict
Merge branch 'master' of https://github.com/asi1024/simpleArchitecture