Merge pull request #184 from lorderikir/master

[U] v0.9.5 release
MARIE-js · Sep 12, 2016 · 73a3d1d · 73a3d1d
2 parents 05359bb + 4594b17
commit 73a3d1d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/MARIE-js/MARIE.js.svg?branch=master)](https://travis-ci.org/MARIE-js/MARIE.js) [![Gitter chat](https://badges.gitter.im/MARIE-js/gitter.png)](https://gitter.im/MARIE-js/Lobby) [![npm version](https://badge.fury.io/js/npm.svg)](https://badge.fury.io/js/npm)
 ==============
-Current version: `0.9.4`
+Current version: `0.9.5`
 
 MARIE.js is an implementation of a simulator for a 'Machine Architecture that is Really Intuitive and Easy'
 from [The Essentials of Computer Organization and Architecture](https://books.google.com.au/books/about/The_Essentials_of_Computer_Organization.html?id=3kQoAwAAQBAJ&redir_esc=y) (Linda Null, Julia Lobur) in JavaScript.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MARIE.js",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "MARIE.js is an implementation of a simulator for a 'Machine Architecture that is Really Intuitive and Easy' from The Essentials of Computer Organization and Architecture (Linda Null, Julia Lobur) in JavaScript.",
   "main": "index.js",
   "scripts": {

diff --git a/src/templates/partials/nav.ejs b/src/templates/partials/nav.ejs
@@ -18,6 +18,15 @@
                         <li><a id="download"><span class="fa fa-download"></span> Download</a></li>
                     </ul>
                 </li>
+                <li class="dropdown">
+                    <a class="dropdown-toggle" data-toggle="dropdown"><span class="fa fa-lightbulb-o"></span> Examples
+                    <span class="caret"></span></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="./?addition"><span class="fa fa-plus"></span> Addition</a></li>
+                        <li><a href="./?multiply"><span class="fa fa-times"></span> Multiply</a></li>
+                        <li><a href="./?quicksort"><span class="fa fa-sort"></span> Quicksort</a></li>
+                    </ul>
+                </li>
                 <li class="dropdown">
                     <a class="dropdown-toggle" data-toggle="dropdown"><span class="fa fa-pencil"></span> Edit
                     <span class="caret"></span></a>