fix Makefile bug
Merge branch 'master' of github.com:nbirnel/text-for-teh-win

Conflicts:
	Makefile