updated plans styling
updated styling and added side nav
removed conflicts
fixed conflict
updated schema file
added geocoder gem