create migration branch created
Merge branch 'Create_Migration' of http://www.github.com/StyleASD/team_citadel into Create_Migration
Migrations for games, series, cards, attributes and attribute_card.
Models for the card part of the database
commit to pull
Added listing and listing_item migration as well as adding game_id to series table
Models for the series and game
Merge branch 'Create_Migration' of http://github.com/StyleASD/team_citadel into Create_Migration

Conflicts:
	app/models/Game.php
	app/models/Series.php
card.php model
Merge branch 'Create_Migration' of https://github.com/StyleASD/team_citadel into Create_Migration
git ignore fix
Added more model and additions to existing models
Merge branch 'Create_Migration' of http://github.com/StyleASD/team_citadel into Create_Migration

Conflicts:
	app/config/local/database.php
move value from attribute to attribute_card
Merge branch 'Create_Migration' of https://github.com/StyleASD/team_citadel

Conflicts:
	app/config/local/database.php

Also tracking for some files