lalala
Merge branch 'master' of https://github.com/coderiver/dillerhall

Conflicts:
	js/min/valera.min.js