Merge branch 'implementating-match-function'
refactor add/remove time

Took off moment and replaced with date class
Merge branch 'refactor-addtime'
Merge pull request #4 from intoxicated/master

Refactor add/remove time