Update .gitignore
Change database config
Hotel add
Add .htaccess
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/models/hotel.php