clinet fix
Merge branch 'master' of https://github.com/gustavengstrom/codewars

Conflicts:
	uppg1/scripts/functions.js