views
Merge branch 'master' into controller
Removed useless button
done
Merge branch 'controller' of github.com:morganwilde/applepoker