Initial Commit
Merge branch 'master' of https://github.com/forrestbthomas/javascript-battle-website

Conflicts:
	README.md
Merge pull request #1 from forrestbthomas/master

Initial Commit