added divs around pics and vids in waiting view
Merge branch 'master' of https://github.com/g-palmer/hashtags

Conflicts:
	controllers/gameController.js
Merge branch 'master' of https://github.com/g-palmer/hashtags
Merge branch 'GPstyles' of https://github.com/g-palmer/hashtags

Conflicts:
	public/javascripts/app/templates/gameWaitingTemplate.js