Working now
Pregate

Merge branch 'working' of github.com:dantt/H-ACK-Tourism-Wish--n-go

Conflicts:
	app.js
	views/style.css