First Entry
Merge branch 'master' of https://github.com/jasonweitzel/simple-adventure

Conflicts:
	.gitignore