started populate file
fixed Gemfile
move Gemfile changes
Merge branch 'recov' into a
Merge branch 'steve' into dylan