Merge pull request #1 from eye-of-dev/work

first commit
Merge pull request #2 from eye-of-dev/work

Second commit
Update script.js
Merge branch 'master' into work

Conflicts:
	www/js/script.js