Styling the Homepage
Resolving Conflict
Merge branch 'master' of https://github.com/militantjones/foliomatch