What I have so far.
Merge branch 'master' of github.com:danaorourke/JS-RPG
Here we go.