started work on users profile wall
create decks table and a pivot table
fixed migrations and create wall
added second pivot for decks to card
Wall on profile will now show decks that have been created
Merge branch 'profile-wall'

Conflicts:
	app/controllers/UsersController.php
	app/models/Card.php
	app/routes.php
	app/views/master.blade.php
	app/views/profile.blade.php
Making my changes on profile work with master
General layout for welcome page
login profile fixed
Merge branch 'master' of https://github.com/StyleASD/team_citadel

Conflicts:
	app/controllers/UsersController.php
fixed usercontroller link
moved username root down
fixed routing for username
Added attribute, card attribute seeders. Added card attributes and attribute files
Merge branch 'master' of https://github.com/StyleASD/team_citadel
email.php port and host updated
Merge branch 'master' of https://github.com/StyleASD/team_citadel
updated email.php port and host
refining welcome page as well as adding a link to the welcome page in the master blade.
Merge branch 'Welcome_page'

Conflicts:
	app/routes.php
	public/css/styles.css