merge conflict
handling black card creation
Merge branch 'feature/card' into develop

Conflicts:
	app/controllers/CardController.php
	app/database/migrations/2013_05_17_053006_alter_table_add_username_column.php
	app/models/BlackCard.php
	app/routes.php
	app/views/cards/black/create.blade.php
	app/views/layouts/master.blade.php
removing leftover .orig