Merge branch 'master' into feature/embeded-structs

aren55555 · aren55555 · commit 20c2b2286bb1 · 2017-08-01T11:56:56.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /bin/
 /pkg/
 /src/
+/.idea

-Original file line number
+Diff line change
 /bin/
 /pkg/
 /src/
 +/.idea