trying to git pull
fixed merge conflict
Merge branch 'master' of https://github.com/calblueprint/rtr4c
press update model
removed schema.rb copy
changed location of environment_variables.rb
changed loc
removed logfile
Merge pull request #15 from calblueprint/new_press

New press