Merge branch 'feature/nonconformal-MR-p1' into 'master'

Updated gitignore to be friendly with CLion IDE

See merge request nektar/nektar!1405

.gitignore

@@ -19,3 +19,5 @@ ThirdParty
 # Sublime project files
 *.sublime-project
 *.sublime-workspace
+# CLion build directories
+cmake-build-*

CHANGELOG.md

@@ -31,6 +31,9 @@ exporting in .vtu format (!1386)
 - Add option to refine curves in the same manner as the line refinement functionality (!1298)
 - Add refined curves and refined lines now prompt the octree to subdivide until the desired refined delta is reached (!1298)
 
+**Miscellaneous**
+- Updated gitignore to be friendly with CLion IDE (!1405)
+
 v5.2.0
 ------
 **Library**