Merge pull request #37 from tommyschnabel/Tommy

Implemented Jackson and setup a test on url #/test
update another two pages
Merge pull request #36 from tommyschnabel/Yu

update another two pages.

Fixed merge conflicts on this --Tommy
Implemented login and register on the server