Added badges
Merge branch 'master' of https://github.com/rubyconfindia/conference

Conflicts:
	2014/faq.html