Merge branch 'master' into develop-with-masters-docs-changes

# Conflicts:
#	.gitignore
#	docs/_config.yml

.gitignore

@@ -4,5 +4,5 @@
 bin
 !.gitignore
 .DS_Store
-/docs/.jekyll-cache
 /docs/_site
+/docs/.jekyll-cache

README.md

@@ -1,4 +1,9 @@
 # CogTool
+
+<img alt="designs-compared" src="https://user-images.githubusercontent.com/1075425/90916892-8a721f80-e3a7-11ea-9860-ceab32e4b204.png">
+<img alt="wireframes" src="https://user-images.githubusercontent.com/1075425/90916895-8b0ab600-e3a7-11ea-816c-05a3cf16dd6e.png">
+<img alt="demonstration-steps" src="https://user-images.githubusercontent.com/1075425/90916886-88a85c00-e3a7-11ea-8433-f9aa9e0fb0d9.png">
+
 CogTool is a general purpose UI prototyping tool with a difference--
 it automatically evaluates your design with a predictive human
 performance model (a "cognitive crash dummy"). Simply create a
@@ -16,3 +21,22 @@ There is a separate repository of documentation, both for end users
 and for developers: [https://github.com/cogtool/documentation.git](https://github.com/cogtool/documentation.git)
 TODO Merge this seperate repo with the in-branch, GitHub Pages-powered `docs/` folder.
 
+## Building
+To compile CogTool,
+1. Download the source code from [GitHub](https://github.com/CogTool-Modern/cogtool).
+2. Install [Apache Ant](https://ant.apache.org/bindownload.cgi)
+3. From within the project directory, run `ant` 
+
+Running the `ant` command begins the build process specified in `build.xml`. 
+
+<details markdown="1">
+<summary>Building on Windows</summary>
+
+The step in the build process for building Windows installers will only happen when building CogTool on Windows. This steps assumes that you have installed [NSIS](https://nsis.sourceforge.io/Main_Page) and the executable is available at `C:\Program Files (x86)\NSIS\makensis.exe`
+
+</details>
+
+### Related 
+- [CogTool - 32-bit build instructions](https://github.com/cogtool/documentation/blob/master/Processes/configuring-development-machines.txt)
+- [Download Apache Ant](https://ant.apache.org/bindownload.cgi)
+

docs/404.md

@@ -0,0 +1,25 @@
+---
+title: Page not found
+layout: page
+permalink: /404.html
+---
+The requested information could not be found. We've sent this current URL back to our analytics suite.  
+
+<!-- Matomo -->
+<script type="text/javascript">
+    var _paq = window._paq = window._paq || [];
+    /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+
+    _paq.push(['setDocumentTitle',  '404/URL = ' +  encodeURIComponent(document.location.pathname+document.location.search) + '/From = ' + encodeURIComponent(document.referrer)]);
+
+    _paq.push(['trackPageView']);
+    _paq.push(['enableLinkTracking']);
+    (function() {
+    var u="https://cogtool.matomo.cloud/";
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '1']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.src='//cdn.matomo.cloud/cogtool.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s);
+    })();
+</script>
+<!-- End Matomo Code -->

docs/CNAME

@@ -0,0 +1 @@
+www.cogtool.org

docs/_config.yml

@@ -18,19 +18,27 @@ category_dir: /
 # Note - if you enable this, and attempt to view your site locally you have to use the baseurl in your local path.
 # Example, you must use http://localhost:4000/path/to/blog
 #baseurl: /path/to/blog 
-baseurl: ''
 
 # When developing web pages for the help bundle you'll want to add this to the front of all links and css urls.
 # When building the help bundle set this to empty string. jekyll b --config _config.yml,_config_helpbundle.yml
 helpbundledevbaseurl: '/help/'
+baseurl: 
 
 # The URL of your actual domain. This will be used to make absolute links in the RSS feed.
-weburl: https://cogtool-modern.github.io/cogtool/
+url: http://www.cogtool.org
 
 #### Under the Hood Stuff #####
 
+# Use rdiscount as the markdown engine because it generates html5 compliant code for stuff like footnotes
+# If you use maroku (default engine) some of your generated pages may not validate or lint as html5
+# If you don't have it install it via gem install rdiscount
+# markdown: rdiscount
+
 # Makes pretty (descriptive) permalinks. See Jekyll docs for alternatives.
 permalink: pretty
 
+# How many articles do you wish to appear on the front page:
+# paginate: 6
+
 # Exclude metadata and development time dependencies (like Grunt plugins)
 exclude: [README.markdown, package.json, grunt.js, Gruntfile.js, Gruntfile.coffee, node_modules]

docs/_layouts/default.html

@@ -159,6 +159,7 @@
 		::-moz-selection {
 			background-color: hsl( 35, 50%, 90% ); /* base: #005177; */
 		}	</style>
+
 	</head>
 
 <body class="page-template-default page page-id-36 wp-embed-responsive singular image-filters-enabled">
@@ -178,9 +179,9 @@
 			<div class="menu-primary-container">
 				<ul id="menu-primary" class="main-menu">
 					<li id="menu-item-15" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-home menu-item-15"><a href="{{site.baseurl}}/">Home</a></li>
+					<li id="menu-item-17" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-17"><a href="{{site.baseurl}}/blog/">Blog</a></li>
 					<li id="menu-item-97" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-97"><a href="{{site.baseurl}}/tutorial/">Tutorial</a></li>
 					<li id="menu-item-97" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-97"><a href="{{site.baseurl}}/video/">Videos</a></li>
-					<li id="menu-item-17" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-17"><a href="{{site.baseurl}}/blog/">Blog</a></li>
 					<li id="menu-item-32" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-32"><a href="{{site.baseurl}}/publications/">Publications</a></li>
 					<li id="menu-item-40" class="menu-item menu-item-type-post_type menu-item-object-page current-menu-item page_item page-item-36 current_page_item menu-item-40"><a href="{{site.baseurl}}/faqs/" aria-current="page">FAQs</a></li>
 					<li id="menu-item-105" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-105"><a href="https://forum.cogtool.org/" target="_blank">Forums ↗️ </a></li>

docs/_posts/2020-06-04-release-one-four.md

@@ -0,0 +1,15 @@
+---
+title: CogTool v1.4
+date: 2020-07-29T06:30:00+05:00
+author: Justin Geeslin
+layout: post
+categories:
+  - releases  
+---
+## What’s New
+Introduces 64-bit compatibility, including support for macOS Catalina and Windows 10.
+
+## Notes
+This is a large release with every dependency updated for 64-bit, from 2014 to 2020. Please submit bugs in [the issues tab](https://github.com/CogTool-Modern/cogtool/issues).
+
+[Release CogTool v1.4 · CogTool-Modern/cogtool · GitHub](https://github.com/CogTool-Modern/cogtool/releases/tag/1.4)

docs/_posts/2020-06-09-modern-cogtool.md

@@ -6,7 +6,7 @@ author: Justin Geeslin
 layout: post
 guid: http://cogtool.local/?p=55
 categories:
-  - Uncategorized
+  - status-updates
 ---
 Hello World!