Just trying to merge
Merge branch 'master' of https://github.com/zaibacu/zTemplate

Conflicts:
	tests/tests.o