Merge branch 'master' of github.com:tnc-ba/stuff

Conflicts:
	.gitignore
	coding_styleguide.tex
Added section about git pull