Merge branch 'master' into csvfile

Conflicts:
	lib/statistics.cpp
added reading/writing text files as images
added tests for txt write, still fail though
Merge branch 'csvfile' of github.com:MicahChambers/npl into csvfile

Conflicts:
	lib/statistics.cpp