v 1.0.1 уррррраааааа!
Merge branch 'master' of https://github.com/2UP/YC

Conflicts:
	public/js/Card.js
	system/application/views/main.php