finished edit and create feature tests. moved edit link. implemented partial forms. still need to finish controller test for admin
fixed merge conflict