Comment on AudioCardDirective (test git conflict resolution)
Merge branch 'master' of https://github.com/danielabar/bunnyhill

Conflicts:
	client/app/scripts/directives/AudioCardDirective.js