Merge pull request #137 from lorderikir/master

update labelling

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) [![devDependency Status](https://david-dm.org/marie-js/MARIE.js/dev-status.svg)](https://david-dm.org/marie-js/MARIE.js#info=devDependencies) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.svg)](http://gruntjs.com/) [![npm version](https://badge.fury.io/js/npm.svg)](https://badge.fury.io/js/npm)
 ==============
-Current version: `0.7.10`
+Current version: `0.7.11`
 
 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.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "MARIE.js",
-  "version": "0.7.10",
+  "version": "0.7.11",
   "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": {

src/templates/index.ejs

@@ -59,7 +59,7 @@
                             <select id="output-select" class="output-type">
                                 <option>HEX</option>
                                 <option>DEC</option>
-                                <option>ASCII</option>
+                                <option value="ASCII">UNICODE</option>
                                 <option>BIN</option>
                             </select>
 
@@ -119,8 +119,8 @@
                     <select class="form-control" id="input-type">
                         <option value="hex">Hexadecimal</option>
                         <option value="dec">Decimal</option>
-                        <option value="bin">Binary</option>
                         <option value="ascii">Unicode</option>
+                        <option value="bin">Binary</option>
                     </select>
                 </div>
             </div>