Merge pull request #12 from eganhila/master

new initial conditions
fixed several things, everything works!
removed redundant
removed redundant files
init positions from file
worked out weight functions
merged