fiyah base
Merge branch 'master' of github.com:siddartha1992/Mamoru
timers and firebase stuff.
merged