Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'greg/rest-api' into rest-api
Changed blog.tests into a directory. WARNING: remove test.pyc
Added basic test for api index view
Merge remote-tracking branch 'greg/rest-api' into rest-api
Merge pull request #1 from ludw/rest-api

Added a test for api index view