added canon
Merge branch 'master' of github.com:grifdail/GW2014-rebond