Merge basic app for deployment to new heroku instance
Access private gems via oauth token
Adjusted gemfile oauth key for both repos
Bundle install for new source
Removed sqlite3 duplication outside of development group
Merge major prototype version
Adjust gemfile
Tried adjusting string-> text
Remove scripts
Try l12factor in gemfile
Merge branch 'develop'
Insert seedfile
Add static assets
MNerge settings and styles
s3 integration
Add paperclip setting for heroku
Merge stability improvements with updated rewarded gem and numerous improvments
Merge view adjustments and tweaks, including seedfile additions for new challenges
Merge fixed flexslider
Merge message bugfix
Improved notification messages