updated card and attribute card file
Merge branch 'about_us_page' of https://github.com/StyleASD/team_citadel into about_us_page

Conflicts:
	app/database/csv/All_Cards.csv