Initial commit
Initial working file.
Merge http://github.com/mgoycoolea/twofluid
Merge branch 'master' of http://github.com/mgoycoolea/twofluid_plasma

Conflicts:
	README.md
Merge branch 'master' of http://github.com/mgoycoolea/twofluid_plasma