Reading from zip update
Zip reading update
Merge branch 'master' of https://github.com/TeamGriffin/Databases-Teamwork-2014