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
updated my journal
Merge branch 'master' of https://github.com/spsu-auv-team/Journal
Merge pull request #24 from alexevans/master

Updated Journal
updating from my little summer activity
2013-08-26 update
Updated alex's journal
monday night update
Merge pull request #25 from alexevans/master

Updated alex's journal
Merge pull request #26 from Stedwell/master

Monday Night Meeting
Merge branch 'master' of github.com:spsu-auv-team/Journal

Conflicts:
	journal_script/journal_commit_tracker.sh
Added Journal Entries