whatever

asklfjad
background color

bleh
Merge remote-tracking branch 'origin/master'

Conflicts:
	seminars_trips.html