started map fliters and added seed file
seed file done - commented out imagemagick logic in image model to run seed
working on filters
you filter functional
you, friends, everyone filters fully functional
pulled to my local master and resolved all merge conflicts by choosing the remote changes
first round map merge conflict resolution
started working on post-merge functionality
deleted .env.orig