New uber makefile
Merge branch 'master' of github.com:raffomania/pink-fluffy-unicorns

Conflicts:
	Makefile