Changes
Merge branch 'master' of https://github.com/2014-ITN/2014-ITN

Conflicts:
	new-proposal/excellence.tex
	new-proposal/preamble.tex