random changes
Merge branch 'master' of https://github.com/gwiederhecker/F429

Conflicts:
	.texpadtmp/F429_1s2014.aux
	.texpadtmp/F429_1s2014.log
	.texpadtmp/F429_1s2014.nav
	.texpadtmp/F429_1s2014.out
	.texpadtmp/F429_1s2014.snm
	.texpadtmp/F429_1s2014.synctex.gz
	.texpadtmp/F429_1s2014.toc
	Slides/F429_1s2014.pdf
don't know, merge issues