fixed fellowship errors
Merge branch 'master' of git@github.com:yoyocicada/ocfc.git

Conflicts:
	OCFC_API_tests.paw
	server/controllers/fellowships.js