merge pr mattmakai#177 and add a couple new pycharm resources

mattmakai · mattmakai · commit fa3b692b74ec · 2018-07-12T08:27:52.000-04:00
diff --git a/content/pages/02-development-environments/05-pycharm.markdown b/content/pages/02-development-environments/05-pycharm.markdown
@@ -38,3 +38,11 @@ Python code.
   is specific to developing and debugging 
   [with the Pyramid web framework](/pyramid.html).
 
+* [Just switched from Atom to PyCharm](https://www.reddit.com/r/learnpython/comments/5j67wu/just_switched_from_atom_to_pycharm/)
+  is a Reddit [/r/learnpython](https://www.reddit.com/r/learnpython)
+  thread with a positive experience of switching to PyCharm along with
+  some comments and feedback from other developers.
+
+* [PyCharm Vs Visual Studio Code For Python Development](https://www.c-sharpcorner.com/article/pycharm-vs-visual-studio-code-for-python-development/)
+  compares the editors on performance, extensions and resource consumption
+  for Python development.
diff --git a/content/pages/meta/00-change-log.markdown b/content/pages/meta/00-change-log.markdown
@@ -17,6 +17,8 @@ on GitHub.
 
 ## 2018
 ### July
+* Merged [PR #177](https://github.com/mattmakai/fullstackpython.com/pull/177)
+  that adds a new [Docker](/docker.html) Swarm tutorial.
 * Merged [PR #176](https://github.com/mattmakai/fullstackpython.com/pull/176)
   to update the [Django](/django.html) page by removing some old links and
   adding newer ones.
