Only use bootstrap grid system.

http://twitter.github.io/bootstrap/customize.html
Ignore .DS_Store files.
Finish merge