Error where comments were not displaying fixed
Merge branch 'master' of https://github.com/mcb80x/minimal-player into edits

Conflicts:
	frontend/js/player_main.coffee
	static/js/player_main.js
Merge pull request #61 from thompsona/edits

Error where comments were not displaying fixed