Added flights to the profile
Merge remote-tracking branch 'origin/master'

Conflicts:
	match/templates/profile.html