merge
Merge branch 'master' of https://github.com/cthaeh/NINIRODIE-HOTEL

Conflicts:
	Codigo SQL/Dropper_2C.sql