updated makefile to include proper directories
Merge branch 'master' of https://github.com/iburinoc/spass

Conflicts:
	Makefile