different database
Merge branch 'master' of https://github.com/mtarsel/dream-girlz

Conflicts:
	mooc_data.db
Merge branch 'master' of https://github.com/mtarsel/dream-girlz
need to fix login and logout
should have pushed
Merge branch 'master' of https://github.com/mtarsel/dream-girlz

Conflicts:
	mooc_data.db
test
Conflicts:
	mooc_data.db
aksldfj