Merge resolution
Merge branch 'master' of github.com:nkabrown/dispatches
CSS styling for landing page
Merge conflict resolution