merge errors
Merge branch 'master' of https://github.com/aahernandez/dateright
merge fix
Merge branch 'master' of https://github.com/aahernandez/dateright
Merge branch 'master' of https://github.com/aahernandez/dateright
Merge branch 'master' of https://github.com/aahernandez/dateright
Merge branch 'master' of https://github.com/aahernandez/dateright
Draggable and Sortable Date Plans