updated
Merge branch 'master' of https://github.com/HPenchev/Team-Cantaloupe---JS-Game