schema update
Merge branch 'master' of cumuseum.colorado.edu:/data/web/rails_beesneeds
Merge branch 'master' of /Users/joshfermin/Dropbox/Projects/rails_beesneeds
updating .gitignore to ignore public files
updating schema
Merge branch 'master' of cumuseum.colorado.edu:/data/web/rails_beesneeds