fixed minor redo bug
Merge remote-tracking branch 'origin/master'

git ignore google cal auth