Added Master Password

Moved from „Worth Mentioning“ to the first box on the left.

index.html

@@ -1336,55 +1336,57 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 <strong>If you are currently using a password manager software like 1Password, LastPass, Roboform or iCloud Keychain you should pick an alternative here.</strong>
 </div>
 <div class="row">
+
+
 <div class="col-sm-4">
 <div class="panel panel-success">
 <div class="panel-heading">
+<h3 class="panel-title">Master Password - Cross-platform</h3>
+</div>
+<div class="panel-body">
+<p><img src="img/tools/Master-Password.jpg" alt="Master Password" align="right" style="margin-left:5px;">Master Password is based on an ingenious password generation algorithm that guarantees your passwords can never be lost. Its passwords aren't stored: they are generated on-demand from your name, the site and your master password. No syncing, backups or internet access needed.
+</p>
+<p><a href="https://ssl.masterpasswordapp.com/" target="_blank"><button type="button" class="btn btn-success">Website: masterpasswordapp.com</button></a></p>
+<p>OS: Windows, Mac, Linux, iOS, Android, Web.</p>
+</div>
+</div>
+</div>
+
+<div class="col-sm-4">
+<div class="panel panel-info">
+<div class="panel-heading">
 <h3 class="panel-title">KeePass / KeePassX - Local</h3>
 </div>
 <div class="panel-body">
 <p><img src="img/tools/KeePass.png" alt="KeePass" align="right" style="margin-left:5px;">KeePass is a free open source password manager, which helps you to manage your passwords in a secure way. All passwords in one database, which is locked with one master key or a key file. The databases are encrypted using the best and most secure encryption algorithms currently known: AES and Twofish. See also: <a href="http://www.keepassx.org/" target="_blank">KeePassX</a>.</p>
 <p>
-<a href="http://keepass.info/download.html" target="_blank"><button type="button" class="btn btn-success">Website: keepass.info</button></a>
+<a href="http://keepass.info/download.html" target="_blank"><button type="button" class="btn btn-info">Website: keepass.info</button></a>
 </p>
 <p>OS: Windows, Mac, Linux, iOS, Android, BSD.</p>
 </div>
 </div>
 </div>
+
 <div class="col-sm-4">
-<div class="panel panel-info">
+<div class="panel panel-warning">
 <div class="panel-heading">
 <h3 class="panel-title">Encryptr - Cloud Based</h3>
 </div>
 <div class="panel-body">
 <p><img src="img/tools/Encryptr.png" alt="Encryptr" align="right" style="margin-left:5px;">Encryptr is simple and easy to use. It stores your sensitive data like passwords, credit card data, PINs, or access codes, in the cloud. However, because it was built on the zero knowledge Crypton framework, Encryptr ensures that only the user has the ability to access or read the confidential information.</p>
-<p><a href="https://encryptr.org/" target="_blank"><button type="button" class="btn btn-info">Website: encryptr.org</button></a></p>
+<p><a href="https://encryptr.org/" target="_blank"><button type="button" class="btn btn-warning">Website: encryptr.org</button></a></p>
 <p>OS: Windows, Mac, Linux, Android.</p>
 </div>
 </div>
 </div>
 
-<!-- Mitro is shutting down Aug. 31st: https://www.mitro.co/shutdown.html
+
-<div class="col-sm-4">
-<div class="panel panel-warning">
-<div class="panel-heading">
-<h3 class="panel-title">Mitro - Browser (Web)</h3>
-</div>
-<div class="panel-body">
-<p><img src="img/tools/Mitro.png" alt="Mitro" align="right" style="margin-left:5px;">Mitro securely saves passwords and lets you share them with others. Mitro automatically saves passwords for any web site. You can then share your accounts with co-workers or friends. Everything is protected with strong, industry-standard encryption. Mitro supports two-factor authentication.
-</p>
-<p><a href="https://www.mitro.co/" target="_blank"><button type="button" class="btn btn-warning">Website: mitro.co</button></a></p>
-<p>OS: Firefox, Google Chrome, Safari.</p>
-</div>
-</div>
-</div>
--->
 
 </div>
 
 <h3>Worth Mentioning</h3>
 <ul>
 <li><a href="http://www.supergenpass.com/" target="_blank">SuperGenPass</a> - A master password and the domain name of the Web site you are visiting is used as the “seed” for a one-way hash algorithm (base-64 MD5). The output of this algorithm is your generated password. You remember one password (your “master password”), and SGP uses it to generate unique, complex passwords for the Web sites you visit. Your generated passwords are never stored or transmitted, so you can use SGP on as many computers as you like without having to “sync” anything.</li>
-<li><a href="https://ssl.masterpasswordapp.com/" target="_blank">Master Password</a> - An ingenious password solution that makes your passwords truly impossible to lose. While password managers generally save your passwords in an encrypted vault or upload them to the cloud for safe-keeping, they make you dependent on syncing, backups or Internet access. Master Password has none of these downsides. Its passwords aren't stored: they are generated on-demand from your name, the site and your master password; even on a brand-new iPhone without restoring any backups or Internet access.</li>
 <li><a href="http://pwsafe.org/" target="_blank">Password Safe</a> - Whether the answer is one or hundreds, Password Safe allows you to safely and easily create a secured and encrypted user name/password list. With Password Safe all you have to do is create and remember a single "Master Password" of your choice in order to unlock and access your entire user name/password list.</li>
 </ul>