final version fall 2013
Merge branch 'master' of https://github.com/jdmalia/boom