uploaded what I have done so far with the diagrams
Merge branch 'master' of https://github.com/hugoleandersson/TravelMatch

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