look how smart anthony is
Merge branch 'master' of https://github.com/tapiture/Tapiture-v3-Templates

Conflicts:
	.gitignore