new pic changes
Merge branch 'master' of https://github.com/m-schrepel/ping-temp

I changed the .scss to .css because I didn't have mixins or anything