make analysis
Merge branch 'master' of github.com:simonask/fatso

Conflicts:
	Makefile