Change to 1 inch margins
Fix apostrophe bug
Add CB's notes on the proposal
Merge branch 'proposal'