Merge latest downstream

.gitignore

@@ -0,0 +1,54 @@
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# CMake->MSVC artifacts
+*.sln
+*.vcxproj
+ALL_BUILD
+ZERO_CHECK
+
+# MSVC secondary artifacts
+*.suo
+*.vcxproj.filters
+*.vcxproj.user
+*.pdb
+*.ilk
+*.lastbuildstate
+*.sdf
+*.opensdf
+Debug/
+Release/
+
+CMakeCache.txt
+CMakeFiles
+Makefile
+*.cmake
+*.cbp
+
+libfc.a
+libfc_debug.a
+
+*.sw*
+
+fc_automoc.cpp
+git_revision.cpp
+GitSHA3.cpp
+
+ntp_test
+task_cancel_test
+udt_client
+udt_server

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "vendor/secp256k1-zkp"]
+	path = vendor/secp256k1-zkp
+	url = https://github.com/cryptonomex/secp256k1-zkp.git
+[submodule "vendor/websocketpp"]
+    path = vendor/websocketpp
+    url = https://github.com/zaphoyd/websocketpp.git