Added stuff about the NSA
Resolved Merge Conflict
Unresolved merge conflict