fixing merge conflict
Merge branch 'master' of https://github.com/LiaKitamura/Glass-Over-Flowing
moves greyscale.css file to app folder. renamed back-ground image tags