Merge branch 'master' of https://github.com/ArthurStam/kupaka

Conflicts:
	public/javascript/build/script.js