Resolved a conflict from different computers...
First merger to current repo
Just testing how to commit
deleted left over (debug) printf statement
Merge pull request #65 from jdegraaf/reactant

deleted left over (debug) printf statement
Hi Axel,

here are the changes due to your suggestions to Ivan:

- changed the code according to extra/ --> fsi/
- added our implementation in the ug (5.4, 13)
- deleted 'upscale' from the imd commands

Hopefully it works, as it is the first time I am using github.

Best regards,
Markus
testing
Merged from Ivan
Merge branch 'master' of git://github.com/espressomd/espresso into object-in-fluid
Some more fixes and lots of comments
Minor add
galilei is all finished up, must still work on the reactions
Merge branch 'object-in-fluid' of git://github.com/arnolda/espresso
I solved some issues from the TODO.txt.
Now the previous commit is ok.

Ivan
mathtools were removed. I either deleted unnecassary functions, or replaced the existing ones from utils.h or I added new function to utils.h, they are located at the end of utils.h
mathtools were removed. I either deleted unnecassary functions, or replaced the existing ones from utils.h or I added new function to utils.h, they are located at the end of utils.h
Merge branch 'master' of https://github.com/icimrak/espresso
Some issues resolved from TODO.txt, namely
- I removed the ifdef statements for stretching, bending and local_area forces.
- I fixed the hardcoded paths in samples
First step in the implementation of Shan-Chen method with MD coupling: structures and functions modified to allow multiple components. So far working/tested only for a single component (see testsuite/sc.tcl. To activate it, #define SHANCHEN <N>, with <N> number of components in myconfig.h