updated company info
minor change in span value 9 to 11
Merge branch 'master' of https://github.com/kunovsky/put_it_out into about_company
Merging, assuming that timers new.html.erb wants to  removed
Merge pull request #70 from kunovsky/about_company

About company, just some placeholder info on that page.  Will be working on adding a google map about our location on that page next.
added google maps gem for rails
added javascript for google map on Company page
added map to company view
 added scripts for google map
Merge pull request #71 from kunovsky/googlemaps_company_location

Googlemaps company location
fixed elaine's merge conflict
Update seeds.rb

added content seeds
disabled google maps, ajax comment upvoting and downvoting works
Merge pull request #72 from kunovsky/jake_commits_to_master

added content seeds
Merge branch 'master' of https://github.com/kunovsky/put_it_out into tests_for_features_ty
pulling down jakes code
finished ajazing upvote and downvote