removed comments
Merge branch 'master' into view
Merge branch 'view' of github.com:morganwilde/applepoker
money
Merge branch 'controller' of github.com:morganwilde/applepoker
Merged
fixed the username label
cents
cents
Merge branch 'master' into controller
Merge branch 'view' of github.com:morganwilde/applepoker
Merge branch 'controller' of github.com:morganwilde/applepoker
avatar update
Merge branch 'model' of github.com:morganwilde/applepoker
Merge branch 'controller' of github.com:morganwilde/applepoker
Added the border class
Added Regex into helpers
preparing for merge
Merge branch 'master' into controller
Updated User with regex