From b81bc0f34c48484768c02b01a2873fbda88eb804 Mon Sep 17 00:00:00 2001
From: Faraz Fallahi <fffaraz@gmail.com>
Date: Fri, 10 Oct 2014 15:16:56 -0500
Subject: [PATCH] CppCon

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 57540d5..a266146 100644
--- a/README.md
+++ b/README.md
@@ -532,6 +532,7 @@ A curated list of awesome C/C++ frameworks, libraries, resources, and shiny thin
 *Useful C/C++ related websites.*
 
 * [Standard C++](http://isocpp.org/) :star: - News, Status & Discussion about Standard C++.
+* [CppCon](http://cppcon.org/) - The C++ Conference.
 * [C++ reference](http://cppreference.com/) - C++98, C++03, C++11, C++14 reference.
 * [cplusplus.com](http://www.cplusplus.com/) - The C++ Resources Network.