Merge pull request #27 from carharttjimmy/candidate

Candidate
Merge pull request #15 from carharttjimmy/master

Update candidate with master
Update README.md
Merge pull request #28 from carharttjimmy/candidate

Lets get working with JSON
Merge branch 'master' into candidate

Conflicts:
	README.md
Merge pull request #29 from carharttjimmy/candidate

Add event handler, resources, and faction
Update README.md
Merge pull request #18 from Avslor/master

Hmmm fixes