Handle redirect in servlet
Merge in remote changes from day4