before pull
Merge branch 'master' of github.com:mantgomery/ksymax
fix user image upload