adding finished controller
refactored controller
Merge pull request #8 from dce2956/debugging-controller

Debugging controller
merging into master
Merge branch 'styles'
adding timer
merged with master, now working