Fixed merge issue
Merge branch 'master' of https://github.com/andre-arsenault/How-was-your-day-