functionality of servlet nearly done
Added som test methods
Merge remote-tracking branch 'origin/master'