merge conflict
Merge branch 'master' of https://github.com/aahernandez/dateright
need delete function fix
Merge branch 'master' of https://github.com/aahernandez/dateright