fix dependecies
fix dependencies
fix dependencies
Merge branch 'master' of git@github.com:walnutgeek/OnTimer.git

Conflicts:
	requirements.txt