initial changes to cards view
changes to the cards layout, a positioning bug on the like button
Merge branch 'master' into nick

Add user image uploads
add reject functionality and fix cards