Merge branch 'master' of C:\Users\Robin\Documents\School\INF3\Software Development\Project\TeamC with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/main/webapp/WEB-INF/views/headerView.jsp
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
tripview info