did some stuff with bootstrap and so on...
fixed merge conflicts.