Merge pull request #5 from Eddlemania/gh-pages

Team Julie Final?
Merge pull request #6 from Eddlemania/gh-pages

hoping
update offerings page
Merge branch 'JFbranch'
last minute
Merge branch 'master' into gh-pages
merging I hope