few changes
Merge branch 'master' of https://github.com/var-mar/thehighesthumantower

Conflicts:
	thehighesthumantower_nodeApp/public/js/main.js