private
Merge branch 'master' of https://github.com/LeonardoGtz/Chimera-Arts

Conflicts:
	Hell Hunt/nbproject/private/private.xml