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

Conflicts:
	uppg3/scripts/client.js