removed bad scss directories after failed git merge
restored major responsive styles and bugfixes