task 7 and updates
Merge branch 'master' of https://github.com/MinskLab2014-Spring/Module7-ETL