can't add self--take 2
Merge branch 'ltolias'

Conflicts:
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/settings.pyc
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.pyc
can't add self
Merge branch 'ltolias'

Conflicts:
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/settings.pyc
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.pyc
delete
Merge branch 'ltolias'

Conflicts:
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.pyc
Merge branch 'ltolias'

Conflicts:
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/views.pyc
Base fix and settings modal attempt (try 1)
And forgot to update views/settings :p
try 2
GRRR the person who put the } in the wrong place
Merge branch 'ltolias'

Conflicts:
	roommeet-1/roommeet/views.pyc
fix
none
Merge branch 'ltolias'

Conflicts:
	roommeet-1/roommeet/views.py
	roommeet-1/roommeet/views.pyc
pyc
fixed table borders
bs
Merge branch 'master' of https://github.com/dschen/roommeet

Conflicts:
	roommeet-1/roommeet/bootstrap/gmap.js
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/templates/profile.html
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.pyc
.pyc