Fix merge conflict on pulling from staging branch Merge branch 'staging' of https://github.com/andela/kissa-cfh-project into bug/heroku-deployment
Fix merge conflict on pulling from staging branch
Merge branch 'staging' of https://github.com/andela/kissa-cfh-project into bug/heroku-deployment

andela/kissa-cfh-project,andela/kissa-cfh-project