Reverting makefile changes
Merge branch 'master' of github.com:gibsjose/Spectrum

Conflicts:
	makefile
Merge branch 'master' of github.com:gibsjose/Spectrum