a lot of new changes
a new Commnet at top of the page
resolve merge conflict
new AngularJS tut
Merge branch 'r2_index'