Magin fix for time
Merge branch 'master' of github.com:RaunaqSuri/ENGHACK-2014