u
Merge branch 'master' of github.com:kayhman/GTD

Conflicts:
	newgtd.org