testig
Merge branch 'master' of https://github.com/hugoleandersson/TravelMatch

Conflicts:
	js/controllers.js
Merge branch 'master' of https://github.com/hugoleandersson/TravelMatch