Added google maps and fixed formatting
conflicts fixed