Merge branch 'master' of C:\Users\Eli Marudi\Documents\Planner6 with conflicts.
Merge remote-tracking branch 'origin/master'
Added