This is a test of the git-flow feature branch functionality
Enabled 2D images as input in CustomGenerator
Deleting some generated image files
Updated doc string (to test git functions)
Revert "Updated doc string (to test git functions)"

This reverts commit f4564e104950804e71ae1dcee009584b26633221.
Update get_neighbor_throats to return an ndarray rather than a list when flatten if False
Cleanup of GenericNetwork:  added flatten functionality to several methods, expanded doc strings
Update of gitignore; recommit of my script file (JTG)
Revert "Changed GenericGenerator to no longer call "return self._net" in the generator step, instead requiring a netowork object to be assigned explicity with the get_net function"

This reverts commit 0a22d8f7811702a3327364e79894913f48d00f6c.
Update run_script to work with reverted .generate() which now returns the network rather than requiring a call to get_net
Update of gitignore
Creation of branch specific script file.  Now we can change this script to test the branch, without breaking the script for other branches.
Revert "Cleanup of GenericNetwork:  added flatten functionality to several methods, expanded doc strings"

This reverts commit 61cd2029f298af74f802973eeb9d64193b437c78.
Revert "Update get_neighbor_throats to return an ndarray rather than a list when flatten if False"

This reverts commit 1c76aef56a3bfccc56d512e4aa13bfa0fea86450.
Introduction of CapillaryPressure file into the physics module
Merge branch 'develop' into feature/PhysicsModule.  This is to bring the changes that have been occuring on develop over the feature branch.
Clean up of script_dev_PhysicsModule