fix bug
fix merge bugs
Add Prisoner to program
add main page