Team PR17

please use http://jsonlint.com/ to make sure the json file in your PR is valid