update ashish's information
Merge branch 'master' into devfest
fix image
Merge pull request #178 from adicu/devfest

Devfest