Merge branch 'master' of https://github.com/NaiaraAcosta/GDD2014

Conflicts:
	FrbaHotel/FrbaHotel.suo