Adding something to my line.
Merge branch 'master' of https://github.com/stoyan3d/gittest

Conflicts:
	Scripts/gittest.js