Merge branch 'master' of https://github.com/amiracle/homemonitor

Conflicts:
	README.md
	default/app.conf

Author: amiracle

README.md

@@ -4,7 +4,13 @@ Splunk app for home | monitor >
 
 Author: Kamilo Amir
 
+<<<<<<< HEAD
 Version: 4.3.0
+=======
+=======
+Version: 4.2.3
+
+>>>>>>> 5b8df2b7dc93cf22083d6b143e1b797a7bb5ac91
 
 Home Monitor App for Splunk
 
@@ -37,7 +43,9 @@ What's new:
 
 What might need to be done:
 
-I was thinking about creating a setup page, so more advanced users can configure the app to suite their customized networks.  When I get more motivation, I'll work on setting up tags for local networks and a setup page that allows you to change some of the inputs or specify your local network IP address space.
+Create a master list of non-routable IP’s (private IP’s)
+Create Bad IP collection (mongoDB) to keep track of bad IP’s and domains hitting routers.
+
 
 Note: