Fixed bugs
Merged master into work
Merge branch 'master' into work

Conflicts:
	www/js/script.js
Fixed any bugs
Merge pull request #5 from eye-of-dev/work

Fixed any bugs