Laptop
Merge branch 'master' of https://github.com/matjohsch/learninggit

Conflicts:
	learning_tex.txt