block diagram
fixed merge conflict and made final edits
Merge branch 'master' of http://github.com/rhodeser/servo-and-protecto