added devise
added sites and images
rollback time
fixed merge conflicts
just stuff
fixed problems