added new cardimages
changed credentials
fixed dirty file
fixed merge conflict
removed awesome font cdn and made it local
fixed merge conflict
fixed merge request