Seperated classes, stick and timer.
Merge branch 'master' of github.com:StevenZabolotny/final-pd3-StevenZ-EricK-shiny-octo-dangerzone

Conflicts:
	Final.java

git commit Final.java -m "Merging."