Changed makefile
Merge branch 'master' of https://github.com/tophmatthews/buck

Conflicts:
	Makefile