Fixed Seeds
Merge branch 'bootstrap'
"Merged in Bootstrap branch"
XMerge branch 'master' of https://github.com/TeachBackTeam/TeachBack
Fixed Seeds
fixed logout
updated db
Merge branch 'master' into bootstrap

Conflicts:
	db/seeds.rb
fixed conflicts