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

Conflicts:
	icsoc2014.synctex.gz
Merge remote-tracking branch 'origin/master'

Conflicts:
	icsoc2014.synctex.gz