Merge branch 'master' of github.com:waylex/FireCode

Conflicts:
	README.md
Merge branch 'master' of github.com:waylex/FireCode