added css and imgs folder, changes jakefiles so they are added to
deployment
Fixed merge conflicts