Added boxes module.
Added ds module.
Added file_entity module.
Added media module v 7.x-2.x-dev.
Added menu_block module.
Added Mac-specific .DS_Store files to .gitignore.
Added navigation and basic styles
Resolved merge conflict with .gitignore.