starting to work Monday night
rm conflict files
rough clean of jsps now working through userName request
rough clean of jsps now working through userName request