commented out a little thing
reorganized application file
checking
fixed merge conflict
model testing done