it just wants me to commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Poster/poster.tex