added time scheduler
updated README
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
updated from upstream
Merge branch 'iss3'
moved journal_script to branch iss3
Merge pull request #23 from theNerd247/master

Cleaned up Master