updated
 cvs files and attribute card seeder file
images upload
Merge branch 'master' of https://github.com/StyleASD/team_citadel

Conflicts:
	public/images/series/1.jpg
	public/images/series/10.jpg
	public/images/series/100.jpg
	public/images/series/101.jpg
	public/images/series/102.jpg
	public/images/series/103.jpg
	public/images/series/11.jpg
	public/images/series/12.jpg
	public/images/series/13.jpg
	public/images/series/15.jpg
	public/images/series/16.jpg
	public/images/series/17.jpg
	public/images/series/18.jpg
	public/images/series/19.jpg
	public/images/series/2.jpg
	public/images/series/20.jpg
	public/images/series/21.jpg
	public/images/series/22.jpg
	public/images/series/23.jpg
	public/images/series/25.jpg
	public/images/series/26.jpg
	public/images/series/27.jpg
	public/images/series/28.jpg
	public/images/series/29.jpg
	public/images/series/3.jpg
	public/images/series/30.jpg
	public/images/series/31.jpg
	public/images/series/32.jpg
	public/images/series/33.jpg
	public/images/series/34.jpg
	public/images/series/36.jpg
	public/images/series/37.jpg
	public/images/series/38.jpg
	public/images/series/39.jpg
	public/images/series/4.jpg
	public/images/series/40.jpg
	public/images/series/41.jpg
	public/images/series/42.jpg
	public/images/series/43.jpg
	public/images/series/44.jpg
	public/images/series/45.jpg
	public/images/series/46.jpg
	public/images/series/47.jpg
	public/images/series/48.jpg
	public/images/series/5.jpg
	public/images/series/50.jpg
	public/images/series/51.jpg
	public/images/series/52.jpg
	public/images/series/53.jpg
	public/images/series/54.jpg
	public/images/series/55.jpg
	public/images/series/56.jpg
	public/images/series/57.jpg
	public/images/series/58.jpg
	public/images/series/59.jpg
	public/images/series/6.jpg
	public/images/series/60.jpg
	public/images/series/61.jpg
	public/images/series/62.jpg
	public/images/series/63.jpg
	public/images/series/64.jpg
	public/images/series/65.jpg
	public/images/series/66.jpg
	public/images/series/67.jpg
	public/images/series/68.jpg
	public/images/series/69.jpg
	public/images/series/7.jpg
	public/images/series/70.jpg
	public/images/series/71.jpg
	public/images/series/72.jpg
	public/images/series/73.jpg
	public/images/series/74.jpg
	public/images/series/75.jpg
	public/images/series/76.jpg
	public/images/series/77.jpg
	public/images/series/78.jpg
	public/images/series/79.jpg
	public/images/series/8.jpg
	public/images/series/80.jpg
	public/images/series/81.jpg
	public/images/series/82.jpg
	public/images/series/83.jpg
	public/images/series/84.jpg
	public/images/series/85.jpg
	public/images/series/86.jpg
	public/images/series/87.jpg
	public/images/series/88.jpg
	public/images/series/89.jpg
	public/images/series/9.jpg
	public/images/series/90.jpg
	public/images/series/91.jpg
	public/images/series/92.jpg
	public/images/series/93.jpg
	public/images/series/94.jpg
	public/images/series/95.jpg
	public/images/series/96.jpg
	public/images/series/97.jpg
	public/images/series/98.jpg
	public/images/series/99.jpg
lost files after ppk incident, recreating
Added google analytics
Added attribute card sql file, fixed attribute pivot table
Merge branch 'master' of https://github.com/StyleASD/team_citadel
Card attributes are now viewable
Merge branch 'about_us_page'
altered image size on card page
added cards attribute sql file
Merge branch 'master' of https://github.com/StyleASD/team_citadel into about_us_page