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

Conflicts:
	README.md
Update README