not done
Merge branch 'master' of github.com:kayson/talespin
group adding
conflict fix