switched to cat and pugs
Merge branch 'master' of github.com:hypemarks/wow-interactive-social-display

Conflicts:
	app/src/main.js