Finish user edit, udate, index, and destroy actions
- updating files from messed up merge