Fix app crash caused by misplaced </tam> tag
Merge copyright change
Merge branch 'master' of ssh://git@github.com/bradchristie/taminations
Merge branch 'master' of ssh://git@github.com/bradchristie/taminations
Update with 2011 C-2 changes from Callerlab
Updated diagrams