added code;
commited without fixing the merge conflit from a pull
chances exceptions to nullpointer exceptions
additional changes
fixed conflict
commited entire workspace