Controllers update
Merge branch 'master' into controller
Controllers updated
Merge branch 'master' into controller
WORKS
Merge branch 'master' into controller
Merge branch 'master' of https://github.com/morganwilde/applepoker