jasmine fixed
Merged conflict
i fucked up etoe css