commit
Merge branch 'master' of https://github.com/kylox/Templar

Conflicts:
	Templar.suo