If I could spell...
Merge branch 'master' of https://github.com/philsinatra/wbdv240

Conflicts:
	build/agenda.php