first commit. basics work. need to implement time parsing
Merge remote-tracking branch 'origin/master'