Merge branch 'master' of https://github.com/Kaneta1011/OxygenFire

Conflicts:
	OxygenFire.vcxproj
	OxygenFire.vcxproj.filters
Merge branch 'master' of https://github.com/Kaneta1011/OxygenFire