Update Makefile for better cygwin support
Merge branch 'master' of github.com:KnightOS/sass

Conflicts:
	sass/test.asm