Amyvs

Added Huy's work, fixed merge conflict, added Google Map.