fix missing import
Replaced setup script with Makefile
fix missing import
added *~ to .gitignore
Merge branch 'feature/makefile_not_shell' into develop
Merge branch 'develop'

Conflicts:
	setup.sh