Corrected build tools
Merge branch 'master' of github.com:joninvski/setup_my_new_computer

Conflicts:
	Makefile