First commit for Firewall
Merge branch 'master' of github.com:puppetlabs/courseware-lms-content into firewall-dev
File management
Revert "File management"

This reverts commit 85b489edfed089fcb8da819d81b506e96685fd7b.
File management
Merge pull request #23 from BrandtWilson/firewall-dev

Firewall dev
Merge remote-tracking branch 'upstream/master'