wouch
Merge remote-tracking branch 'origin/master'

Conflicts:
	white-terra-413/roadtrip.py
	white-terra-413/templates/new_friends.html
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
wouch