Squashed commit of the following:

commit 608b67b383dec21342a5c0845ce01aef6f6aeea4
Author: ysgard <ysgard@gmail.com>
Date:   Mon May 26 12:43:04 2014 -0700

    Fixed Timer - changed "Timer timer" to "Timer timer = new Timer"

commit 05fadcb02904282073e38997bd2143402ce6c7e7
Author: ysgard <ysgard@gmail.com>
Date:   Mon May 26 10:34:33 2014 -0700

    Working on timer