initial commit
Challenge_1 completed
Merge branch 'master' of github.com:fobabett/Challenge_1

Conflicts:
	challenge_1.js
Merge pull request #1 from fobabett/master

Solved the problem together