Base
Merge branch 'master' of github.com:rosscdh/twimer

Conflicts:
	README.md