Merge pull request #1 from gigaSproule/develop

Replaced time so that there is a task to do in the brown bag test!