Merge pull request #1 from DigitalDesign-Spring2013/thomas

Thomas
Merge pull request #2 from DigitalDesign-Spring2013/thomas

Thomas
Merge pull request #3 from DigitalDesign-Spring2013/thomas

Thomas
Merge pull request #4 from DigitalDesign-Spring2013/thomas

responsive error
Merge pull request #5 from DigitalDesign-Spring2013/thomas

new icons
Merge pull request #6 from DigitalDesign-Spring2013/thomas

err
Update index.html
Merge pull request #7 from DigitalDesign-Spring2013/thomas

Wooohooo
Merge pull request #8 from DigitalDesign-Spring2013/thomas

Divided content parts into partials
silly
Merge pull request #9 from DigitalDesign-Spring2013/te

silly
Revert "silly2"

This reverts commit 0aad88c071090a3957475be926048961985a2cdd.
Merge branch 'gh-pages' of https://github.com/DigitalDesign-Spring2013/digital-design into thomas
Revert "Merge pull request #9 from DigitalDesign-Spring2013/te"

This reverts commit b00e9cc5da043a3f08543b4700f15b2bcb4fb3b2, reversing
changes made to d2099b6dc7ab2c521805812e0f7cee54dc401856.
Merge branch 'gh-pages' of https://github.com/DigitalDesign-Spring2013/digital-design into thomas