prepping for merge
merged
Merge branch 'master' of https://github.com/thekreal/Javascript_Rainforest
reverted changes to fix the infinite scroll functionality
Merge branch 'master' of https://github.com/thekreal/Javascript_Rainforest
merge
merged
Merge branch 'master' of https://github.com/thekreal/Javascript_Rainforest
merge
 adding postgres as production db
commiting for merge
commiting for merge
changed gemfile so that SQLlite should be development only
removed sqllite from gemfile
compiling css for deployment
Merge branch 'master' of https://github.com/thekreal/Javascript_Rainforest
changing config settings
uncomment line to re-implement infinite scroll