Add cfp deadline
- merge pull request #4, resolve conflicts
  + Add CfP deadline to the text

Conflicts:
	content/index.html