Merge remote-tracking branch 'origin/master'

.gitignore

@@ -1,19 +1,29 @@
-.rebar3
-_*
 .eunit
 *.o
 *.beam
 *.plt
-*.swp
-*.swo
-.erlang.cookie
-ebin
-log
 erl_crash.dump
+.concrete/DEV_MODE
+
+# rebar 2.x
 .rebar
-logs
-_build
+rel/example_project
+ebin/*
+deps
+
+# rebar 3
+.rebar3
+_build/
+_checkouts/
+rebar.lock
+
+# idea
 .idea
 *.iml
-rebar3.crashdump
-*~
+cmake-build*
+CMakeLists.txt
+
+# nif compile temp file
+*.pdb
+*.d
+compile_commands.json