Added setting updation
avatar update
Merge branch 'model' of github.com:morganwilde/applepoker
Merge branch 'controller' of github.com:morganwilde/applepoker