Merge pull request #4 from PellelNitram/master

08212014 first implementation done
fixed kappa and DKappa
Merge remote-tracking branch 'upstream/master' into matt

Conflicts:
	DensitySimulation/Functions.py

Manual merging.