updated with model and views
Merge branch 'controller' of github.com:morganwilde/applepoker