Yo
Merge branch 'master' of https://github.com/ytrend/frontend

Conflicts:
	app/Ytrend/search.styl
	app/Ytrend/ytrend.styl