added custom cards. almost finished
merge stuff
updated app iml to fix things