Update real info
deploy configuration
Merge branch 'master' of github.com:pragmaticly/rubyconfchina.org

Conflicts:
	source/index.html.erb