TIMER
Merge branch 'master' of https://github.com/addtheletters/TSA2014

Conflicts:
Assets/Scripts/EnableBackgroundKeyHinge.js
asdf

asdf