wrote 4 page content tests
have 5 page tests total
still finished working on tests
removed unwanted spec file
Merge branch 'master' into landing
added 5 page tests
Implemented login specs
Implemented signup specs. Needed sleep
Removed extraneous signup_spec.rb
Merge branch 'master' into testing
broke up javascripts into separate files
broke up javascripts into separate files
Ignore solr/data
Remove coverage and /solr/data directories
Remove solr pids
THE ZEE WRECKING BALL
Merged adam's landing 2 into landing
added a few supply methods
Resolved merge conflicts from landing branch
info window references google map object