Merge pull request #4 from ccweaver/ccweaver

Update test
Django-MapsAPI-Bootstrap initial upload
Merge branch 'ltolias'
Merge branch 'ltolias'
Merge branch 'master' of https://github.com/dschen/roommeet
Merge branch 'master' into ccweaver