first commit
Merge branch 'master' of https://github.com/eighteight/CinderEight

Conflicts:
	AllInOne
work