By pavan
Merge branch 'master' of https://github.com/rommen/octagon

Conflicts:
	trainings/git test.txt
Merge branch 'master' of https://github.com/rommen/octagon

Conflicts:
	trainings/git test.txt