From d06b18a30c1c862b4737a763bf5caa70a2d54f26 Mon Sep 17 00:00:00 2001
From: Billy Brawner <billybrawner@gmail.com>
Date: Sat, 16 Jan 2016 21:15:46 -0600
Subject: [PATCH] Updated the README and added icons to the Chrome manifest
 file

---
 README.md     | 12 ++++++++----
 manifest.json |  5 +++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e70951b..02685b9 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,16 @@
-# Interval Timer v1.1
+# Interval Timer v1.2
 An interval timer app for FireFox OS
 
 Live Preview: http://wbrawner.com/interval-timer/
 
-### Version 1.1 
+### Version 1.2
+* Bug fixes:
+  - Added a check for screen locking to prevent breaking the app with non-FireFox OS devices
+
+### Version 1.1
 * New Icon design
-* Added 60x60 icon 
-* Bug fixes: 
+* Added 60x60 icon
+* Bug fixes:
   - Screen now stays awake while timer is active and app is open.
   - Back button no longer allows you to enter into negative rounds.
   - A sound is now played at the end of each cycle.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index f47f717..0d561e7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,5 +9,10 @@
       "scripts": ["js/start.js"]
     }
   },
+  "icons": {
+    "512": "/images/icon-512.png",
+    "128": "/images/icon-128.png",
+    "60": "/images/icon-60.png"
+  },
   "offline_enabled": true
 }
\ No newline at end of file