Magin fix for time
Merge branch 'master' of github.com:RaunaqSuri/ENGHACK-2014
Merge pull request #10 from RaunaqSuri/master

merged hamza's quick padding fix