normal

normal
Merge branch 'master' of https://github.com/zxzAndyMAC/NoiceBird

Conflicts:
	Classes/Resource.h
delete

delete