i am a loser
Merge branch 'master' of https://github.com/Stonelinks/requirejs-tpl

Conflicts:
	tpl.js
add gitignore