doin some stuff
timer running
trying new commit
Merge pull request #1 from AndrewGuard/dont_mess_with_the_master

Dont mess with the master