reordered controllers from register controller
Merge branch 'master' of https://github.com/morganwilde/applepoker into controller
Merge branch 'controller' of github.com:morganwilde/applepoker
Merge branch 'master' into view