Merge branch 'master' of https://github.com/KatyCain526/centerforopenscience.org
Merge branch 'communities-addition' of https://github.com/jlcohoon/centerforopenscience.org
Merge branch 'communities-addition' of https://github.com/jlcohoon/centerforopenscience.org
created buttons for journals tab on the opportunities page
fixed merge conflicts
fixed links, added grants