merge

diff --cc .gitignore
index efd36bc3d9f9ce727f934f664505b905ac2c74d0,259148fa18f9fb7ef58563f4ff15fc7b172339fb..cbe4e486b91b7184d3d20b22417dcb6c8b227472
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,32 +1,35 @@@
- *.o
 +*.user
 +
+ # Prerequisites
+ *.d
+ 
+ # Compiled Object files
+ *.slo
+ *.lo
+ *.o
+ *.obj
+ 
+ # Precompiled Headers
+ *.gch
+ *.pch
+ 
+ # Compiled Dynamic libraries
+ *.so
+ *.dylib
+ *.dll
+ 
+ # Fortran module files
+ *.mod
+ *.smod
+ 
+ # Compiled Static libraries
+ *.lai
+ *.la
+ *.a
+ *.lib
+ 
+ # Executables
+ *.exe
+ *.out
+ *.app
++