by jara14
Merge branch 'master' of http://github.com/rommen/octagon

Conflicts:
	trainings/git test.txt