set format date
Merge branch 'master' of github.com:j4cksw/geeky-wanz-mini-twitter
add user
fix conflict home.jsp
merging file