fixed the username label
Merge branch 'view' of github.com:morganwilde/applepoker
Added setting updation
Merge branch 'controller' of github.com:morganwilde/applepoker
Merge branch 'model' of github.com:morganwilde/applepoker
Merge branch 'controller' of github.com:morganwilde/applepoker