do the total merge
Merge branch 'master' of github.com:andreypz/nwu-my-analysis