Pre-LD48 Commit
Merge branch 'master' of github.com:sgreenlay/Gam