refactoring
Merge branch 'master' of github.com:manuelsiuro/island

Conflicts:
	js/index.js