first commit for heroku
changed config.assets.initialize_on_precompile = false
redid gemfilelock
added line to application.rb
application.rb changes
more changes to application.rb
changes to application.rb
fixed merges
Merge branch 'master' into moreTests
Merge branch 'master' of https://github.com/ahsterling/SeeMore-LavenderBlush into moreTests
Merge branch 'master' of https://github.com/ahsterling/SeeMore-LavenderBlush
Merge branch 'master' into moreTests
quote changes to spec_helper.rb
changed gemlock
Rubocop changes to spec files
fix merge conflict
some rubocop changes