Changes changes
Merge branch 'master' of https://github.com/jbarrow/LambdaNet

Conflicts:
	Network/Network.hs