my input
Merge branch 'master' of https://github.com/viktormmarkov/hack

Conflicts:
	app/templates/pages/index.tpl