Edited gitignore.
Merge branch 'master' of github.com:LesleyMdCampo/Point_B

Conflicts:
	vendor/ruby/2.0.0/gems/atomic-1.1.14/ext/Makefile
	vendor/ruby/2.0.0/gems/debug_inspector-0.0.2/ext/debug_inspector/Makefile
	vendor/ruby/2.0.0/gems/hpricot-0.8.6/ext/fast_xs/Makefile
	vendor/ruby/2.0.0/gems/hpricot-0.8.6/ext/hpricot_scan/Makefile
	vendor/ruby/2.0.0/gems/json-1.8.1/ext/json/ext/generator/Makefile
	vendor/ruby/2.0.0/gems/json-1.8.1/ext/json/ext/parser/Makefile
	vendor/ruby/2.0.0/gems/pg-0.17.1/ext/Makefile