merrrrge
Merge branch 'master' of https://github.com/dmlmdev/Ways.git