Merge pull request #1 from gaette09/testing

made a change
Merge branch 'master' of https://github.com/gaette09/tech-webstorm-git

Conflicts:
	app.js
Merge branch 'master' of https://github.com/gaette09/tech-webstorm-git

Conflicts:
	app.js