added dev1
fixed merge conflict
fixed comments
added event logic
pull in changes
flipped gamma and beta
getting ready to pull from canvas again
fix events
pulling canvas down
Merge branch 'canvas' of https://github.com/mfbadr/pot-o-gold into dev1
merged differences with canvas