Merge pull request #10 from eganhila/master

fixed so many things!
finishing pairlist stuff
Finished pair list
added friction to the boundary forces
merged
typos
added surface tension
added surface tension
merge
removed unnecessary files
merge
Set up new initial conditions