rebase
Merge branch 'master' of https://github.com/shawnjanas/capstone2012
cron job updated, added scheduler, app.rb updated