Merge pull request #1 from hame22/feature1-branch

gulp file update
test
test
Merge branch 'master' of https://github.com/hame22/tennis
Merge branch 'master' into alex-test

Conflicts:
	app.js