Condensed into one app, added a heartbeat
Merge pull request #2 from scollett/master

Condensed into one app, added a heartbeat