Add futures and promises overview.
Whitespace fix, ghpages bump
Initial cut at a string interpolation guide.
Merge branch 'master' of git://github.com/scala/scala.github.com
Fix typos, rephrase stuff.
Merge pull request #112 from axel22/master

The Futures overview adaptation
Fixes to make #112 build
String Interpolation - Tweaked wording from pull request feedback.
Merge pull request #114 from scala/fix/SI-6401

Initial cut at a string interpolation guide.
Formatting fixes
Adds author
[Translation to Spanish]: introduction to collections
Reflection and scaladoc guides, footprint
Moved from api package docs
Moved annotation example from scaladocs
Huffman figure for coursera course
Merge branch 'master' of https://github.com/scala/scala.github.com
Moved Type example from scaladocs to guide
Added macros stub
Macros guide moved from scaladocs