ignore this
Merge remote-tracking branch 'origin/master'

Conflicts:
	tingnan/dailyBlog.tex
Merge remote-tracking branch 'origin/master'

Conflicts:
	tingnan/dailyBlog.tex
Merge remote-tracking branch 'origin/master'

Conflicts:
	tingnan/dailyBlog.tex
Merge remote-tracking branch 'origin/master'

Conflicts:
	tingnan/dailyBlog.tex

hopelessly confused trying to git commit