Adding any changes before pulling
Fixing CSS merge conflict
Added in maptest.html file