Simplified echoing in makefile
Merge branch 'master' of https://github.com/jeremija/web-template2

Conflicts:
	Makefile