blocked/urgent post
merge overwrote it
Merge branch 'gh-pages' of github.com:ScrumDoLLC/scrumdo-static into gh-pages

Conflicts:
	CNAME