adding 3 minute time limit
Merge branch 'PrevWorking12914' of github.com:araju/maslab-2014 into PrevWorking12914