add mashery
Merge branch 'mashery' of https://github.com/adicu/adicu.github.com into mashery

Conflicts:
	devfest/sponsors.json
Merge pull request #197 from adicu/mashery

add mashery