Resolved the lil merge conflict
Merge branch 'master' of https://github.com/Yathi/my-site
Changes to home