dev setup
Merge branch 'dev' of https://github.com/gr1sha/makeme into dev