server database.yml
more db stuff
db
db stuff again
db test 2
schema changes
Merge branch 'master' of cumuseum.colorado.edu:/data/web/rails_beesneeds
db test 3
Merge branch 'master' of /Users/joshfermin/Dropbox/Projects/rails_beesneeds
fixing for deployment and adding some changes to styling and wording