This WILL have an API
Merge branch 'master' of github.com:matthewbaggett/HouseDaemon

Conflicts:
	index.php
Begining to flesh out fucntionality
Begining to flesh out fucntionality