moar fish
4 fish!
Merge branch 'master' of github.com:drfickle/pants

Conflicts:
	menu
kill menu
pasta 1
Merge branch 'master' into 8.2