change header on index page
add basic user edit form
move files into public
fixed merge conflicts
cards start to work
mess with favorite button
get show page functioning
nothing really