Updating some stuff that Dropbox might have f-ed up
Add in favorite attribute and making it faster
Updating after removing conflicted copies
Merge branch 'master' of https://github.com/ahcchin/codepathGroupProject

Conflicts:
	GroupProject/GroupProject.xcodeproj/project.pbxproj

GroupProject/GroupProject.xcodeproj/project.xcworkspace/xcuserdata/yi.xc
userdatad/UserInterfaceState.xcuserstate
	GroupProject/GroupProject/Base.lproj/Main.storyboard
	GroupProject/GroupProject/CardClass.swift
	GroupProject/GroupProject/HomeViewController.swift
	GroupProject/GroupProject/WalletClass.swift