Merge branch 'master' of github.com:krebscode/painload

Conflicts:
	mining/Makefile: now installs tmux and configures

1 files changed, 1 insertions, 0 deletions

diff --git a/evan/evan-startup b/evan/evan-startup
index a3370bd1..8a7f8daa 100755
--- a/evan/evan-startup
+++ b/evan/evan-startup
@@ -34,6 +34,7 @@ start() {
 stop() {
   [ ! -e $PIDFILE ] && echo "$PIDFILE does not exist" && return
   kill `cat $PIDFILE`
+  #killall evan
   rm $PIDFILE
 }