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
This commit is contained in:
Sahat Yalkabov
2014-02-27 19:27:11 -05:00
6 changed files with 67 additions and 0 deletions

View File

@ -310,6 +310,7 @@ List of Packages
| underscore | Handy JavaScript utlities library. |
| paypal-rest-sdk | PayPal API library. |
| twilio | Twilio API library. |
| clockwork | Clockwork SMS API library. |
| validator | Used in conjunction with express-validator in **controllers/api.js**. |