Changed the paper
Pulled
My changes
Merge branch 'master' of https://github.com/aravind-vasudevan/europar14

Conflicts:
	formalism.tex
	llncs.log
	llncs.pdf
	llncs.tex
	simulated_annealing.tex