Added google maps and fixed formatting
conflicts fixed
added slogan
fixed column and search bug