sigh
Merge branch 'master' of github.com:mculp/chunkypools.com

Conflicts:
	app/models/pool.rb