fixes
Merge branch 'master' of https://github.com/saarsta/sheatufim

Conflicts:
	views/partials/footer.ejs