user stuff, edit button
Merge branch 'master' of github.com:walkerart/mnartists