From 8f964f4bcada90e092da2645511f711fb994c2bd Mon Sep 17 00:00:00 2001
From: Unknown <jtsshieh@outlook.com>
Date: Sat, 10 Mar 2018 19:48:34 -0500
Subject: Auto stash before merge of "master" and "origin/master"

---
 pokeworld/pokebot/index.html | 3 ++-
 pokeworld/typer/index.html   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pokeworld/pokebot/index.html b/pokeworld/pokebot/index.html
index 9de84b5..d86520f 100644
--- a/pokeworld/pokebot/index.html
+++ b/pokeworld/pokebot/index.html
@@ -31,9 +31,10 @@
             <h2>Download</h2>
             <p>If you are looking for all the newest features but don't care about how stable it is, pick up a copy on our <a href="https://github.com/PokeWorld/PokeBot">GitHub</a>. Otherwise, you can get a <a href="https://github.com/PokeWorld/PokeBot/releases">release</a> which are proven to be a lot more stable than the random things we put on the main branch.</p>
             <p></p>
-            <h2>Continuous Intergration Badges (TravisCI)</h2>
+            <h2>Continuous Intergration Badges (TravisCI, CircleCI)</h2>
             <p>Our friends at travis have tested the compiling of commands to look for bugs. The badge shows if it has passed or failed the test.</p>
             <a href="https://travis-ci.org/PokeWorld/PokeBot"><img src="https://travis-ci.org/PokeWorld/PokeBot.svg?branch=master"></a>
+            <a href="https://circleci.com/gh/PokeWorld/PokeBot"><img src="(https://circleci.com/gh/PokeWorld/PokeBot.svg?style=svg"></a>
             <h2>Changelog</h2>
             <ul>
               <li>v0.3.5 - A bunch of BugFixes and forcedrop command.</li>
diff --git a/pokeworld/typer/index.html b/pokeworld/typer/index.html
index dcfb738..c6e1b2e 100644
--- a/pokeworld/typer/index.html
+++ b/pokeworld/typer/index.html
@@ -25,6 +25,7 @@
             </div>
         </header>
         <div class="container">
+            <h1>DEPRECATED: USE AT YOUR OWN RISK!</h1>
             <h1>Typer</h1>
             <h2>An automatic key-presser tool.</h2>
             <p>Typer is a program to automatically type keys for you while you are away from your computer. We have it in PokeWorld because it is useful for leveling up your PokeMon so they are stronger.</p>
-- 
cgit v1.2.3