incorporating design
incorporating design, adding cap files
cleaning up merge
removing ckeditor, cleaning up database and deploy
cleaning up migrations