Github app

changing test file from github app
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
testing with merging
Merge branch 'ccweaver'

Conflicts:
	test
Merge branch 'master' into ltolias
test
Merge branch 'ltolias'
Merge branch 'master' into ltolias
changes to test
Merge branch 'master' into branch-test-1
agh
Merge branch 'branch-test-1'
testing branching
initial models commit, new people app
Merge branch 'ltolias'
initial models