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