FreeCodeCamp

Merge branch 'master' of https://github.com/mediaburst/hackathon-starter into mediaburst-master

* 'master' of https://github.com/mediaburst/hackathon-starter:
  Update README.md
  Using the newest clockwork npm package
  Removed commentted out lines from clockwork.jade
  Tweak to the clockwork view
  Adding clockwork SMS to the API mix

Conflicts:
	controllers/api.js
	package.json