Stash this and overwrite
Merge branch 'master' of https://github.com/allevitan/olinbartering
Working profile edit form (filters not yet functional)
Merge branch 'master' of https://github.com/allevitan/olinbartering