Buy lotso beer
Merge branch 'master' into adam

Conflicts:
	list.md
Merge pull request #1 from atsheehan/adam

Buy lotso beer