[doc] cppnow-2017

Author: kris-jusiak

docs/cppnow-2017/index.html

@@ -299,10 +299,11 @@
 
 ###Mocking interfaces - modern alternatives
 
-* HippoMocks
-* FakeIt
+* [Mockator](http://www.mockator.com/) / Eclipse CDT
+* [HippoMocks](https://github.com/dascandy/hippomocks)
+* [FakeIt](https://github.com/eranpeer/FakeIt)
 * ...
-* **GUnit.GMock (based on GoogleMock)**
+* **[GUnit.GMock](https://github.com/cpp-testing/GUnit) (based on GoogleMock)**
 
 ----
 
@@ -1915,11 +1916,11 @@
 
 ## Questions?
 
-| | |
-|-|-|
-| GUnit     | https://github.com/cpp-testing/GUnit |
-| VC        | https://github.com/boost-experimental/vc |
-|[Boost].DI | https://github.com/boost-experimental/di |
+| | | |
+|-|-|-|
+| Dependency Injection |[Boost].DI  | https://github.com/boost-experimental/di |
+| Virtual Concepts     | VC         | https://github.com/boost-experimental/vc |
+| Testing/Mocking      | GUnit      | https://github.com/cpp-testing/GUnit |
 
 ---