2.1.1
Merge branch 'develop' of https://github.com/mozilla/makerparty into develop
Added more stuff to the Resources pages
2.1.2
Merge pull request #50 from mmmavis/develop

Added more stuff to the Resources pages