fixes
that silly database....
fix
form fixes
Merge branch 'ccweaver'

Conflicts:
	roommeet-1/roommeet/forms.py
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/views.py
	roommeet-1/roommeet/views.pyc
conflict resolution
person marker!
pyc
Merge branch 'master' of https://github.com/dschen/roommeet

Conflicts:
	roommeet-1/roommeet/views.pyc
person marker
Merge branch 'master' of https://github.com/dschen/roommeet

Conflicts:
	roommeet-1/roommeet/bootstrap/gmap.js
Merge branch 'master' of https://github.com/dschen/roommeet

Conflicts:
	roommeet-1/roommeet/bootstrap/gmap.js
distance houses
me change
fix
myhouse distinction
pyc
Merge branch 'master' of https://github.com/dschen/roommeet
fixed alllllllllll da foooomaaatttiiinnggg
adding houses to my houses attempt