update
Merge branch 'master' of github.com:gdolle/SEME2014_Axessim

Conflicts:
	presentation/prob1.tex