stuff
Update with Ajax
Conflict resolution
json good
CLeaning up ajax
Fix conflicts again
World map added