Blabla
Merged branches
added macros to personal notes
poker bug solved & refined
Merge branch 'master' of https://github.com/Jake91/PrincePolo into Andrea
Finished the branch selection. More or less.
Fixed the checkboxes
Merge branch 'master' of https://github.com/Jake91/PrincePolo into thor2
minor change
merged master to jake
minor change