Revert "testing if commit works"

This reverts commit c1c9c2085e53f9112282896f752a7171718d40d5.
resolved conflict in css file