Merge branch 'master' of https://github.com/pawjanssen/javascript_training

Conflicts:
	client/template.html
Merge remote-tracking branch 'origin/master'