ready for view
merged with new view
image view opening
Merged with new views
prepare renew views
Merge branch 'master' into controller
AvatarModel done?
Merge branch 'master' of https://github.com/morganwilde/applepoker
updated.
merge tool
updated with model and views
From avatarId to avatarModel
Changes
Merge branch 'master' of https://github.com/morganwilde/applepoker
Fixed string to int bug
Merge branch 'controller' of github.com:morganwilde/applepoker
Merge branch 'controller' of https://github.com/morganwilde/applepoker into controller
Fixed avatarId to int in DB
Merge branch 'master' of https://github.com/morganwilde/applepoker into model
Mergetool