Added the border class
preparing for merge
Merge branch 'master' into controller
Merge branch 'view' of github.com:morganwilde/applepoker
Merge branch 'controller' of github.com:morganwilde/applepoker