pyc
Merge branch 'master' of https://github.com/dschen/roommeet

Conflicts:
	roommeet-1/people/__init__.pyc
	roommeet-1/people/models.pyc
	roommeet-1/roommeet/__init__.pyc
	roommeet-1/roommeet/wsgi.pyc
pyc
Merge branch 'master' of https://github.com/dschen/roommeet
pyc
pycs
 pyc
pyc
Revert d43e585..cbff131

This rolls back to commit d43e585995c5d8a13bf84ef26e91c0a40cac3ef4.
pyc
Merge branch 'ccweaver' of https://github.com/dschen/roommeet into ccweaver

Conflicts:
	roommeet-1/people/models.pyc
Merge branch 'newmaster'

This reverts commit d43e585995c5d8a13bf84ef26e91c0a40cac3ef4.

Conflicts:
	roommeet-1/roommeet/bootstrap/gmap.js
	roommeet-1/roommeet/templates/meet.html
pyc
pyc
fix
pycs
Merge remote-tracking branch 'origin/newmaster' into ccweaver

Conflicts:
	roommeet-1/people/models.pyc
Merge branch 'master' into newmaster
Table changes
Name Addition