Added time function
Merge branch 'master' of https://github.com/Legoben/SoHacksProject