some setup for models
Merge branch 'master' of github.com:rpflynn22/questioneer
add passport to package file
add some files for api
quick fix re-add deleted folder
Merge branch 'master' of github.com:rpflynn22/questioneer

Conflicts:
	models/user.js