Fixed all merge conflicts, and repaired all erroneous files.
Integrated twitter bootstrap into layout to streamline the styling of the site and use for responsive design.
Merge pull request #1 from silne30/TwitterBootstrapBranch

Twitter bootstrap branch