going HAMMM
Merge branch 'master' of github.com:teddyknox/HAM