correction
corrections
Merge branch 'feature/create_post_from_client' into features/homePage

Conflicts:
	api/controllers/API/StoryController.js
	api/controllers/API/UserController.js
	api/models/StoryModel.js