Added carousle support
Merge branch 'master' of https://github.com/guyius/hearthstone-card-memorizer

Conflicts:
	app/scripts/factory/factory.js
	app/styles/main.css