git init
Create Posts
add gmaps
add gmaps
add bootstrap-sass. change rails 4.0.3 version.
add bootstrap at assets.
add posts controller and view
Merge branch 'first_branch' into second_branch

Conflicts:
	.gitignore
	Gemfile.lock
	app/assets/stylesheets/application.css
	app/views/layouts/_header.html.erb
	app/views/static_html/home.html.erb
	config/routes.rb
	db/schema.rb
	vendor/assets/stylesheets/bootstrap.css.scss
add post index new edit
add posts view new, index, edit
add status at form in view /posts/new
remove gem 'geocoder' and 'gmaps4rails'
add js file gmaps with script for create map
delete old gmaps references in file
add google map marker and animation for marker
fix load map
fix animation marker
show infoWindow when title is exist
Remove old gmaps js link from
add dropdown for status problem
refactor drop_down js
load local image for map marker
drop .idea