2017-2-Cholitos-Warriors-T3

Please branch from development, not from master!!

Please do a Pull Request to development to your branch, not to master!!