merge conflicts, move psnf to military section

jbjonesjr · jbjonesjr · commit 20e4a2543eb6 · 2018-08-01T10:06:47.000-04:00
diff --git a/_data/governments.yml b/_data/governments.yml
@@ -770,6 +770,7 @@ U.S. Military and Intelligence:
   - ngageoint
   - nsacyber
   - project-interoperability
+  - psns-imf
   - screamlab
   - shareandprotect
   - SIMP
