checking in git repo
Merge branch 'master' of github.com:diklein/fat

Conflicts:
	Rakefile