fixed google font link location
styling
fixed pull merge conflicts
complete dev branch