Added episode #7 special about conferences
Merge branch 'beta' of https://github.com/devminutes/devminutes.github.io into beta

Conflicts:
	index.html
Fixed #7 episode - merge
Merge branch 'beta'

Conflicts:
	index.html