First commit
Added files
Initial commit
Merge https://github.com/slothjones/uptime

Conflicts:
	README.md
test
Merge branch 'master' of https://github.com/slothjones/uptime

Conflicts:
	README.md