Lookin good....
Merge branch 'dev' of github.com:yanzhengli/yelp-glass into dev

Conflicts:
	index.html