Added directory removal to makefile (gives an error if run twice). Fixed some errors in the makefile.
Added option for background lightness, changed command option names due to conflict between height and help. Added default values to help output.
Passed default values to display routine so that they only have to be defined once. Changed the way that command-line options are processed so that defaults are overwritten by command-line (also gives more compact and readable code).
Merge branch 'master' of github.com:ctraabe/TextureGenerator

Conflicts:
	makefile