Small fixes to coding styleguide
More work on guidelines

- Merge different files into single document
- Add git guidelines
Merge branch 'master' of github.com:tnc-ba/stuff

Conflicts:
	.gitignore
	coding_styleguide.tex