code updated
Merge branch 'master' of https://github.com/paceuniversity/gsd2014-team5