migrations complete
deleted assets
need to fix cucumber test but migrations working
migration merge