Removed trailing whitespaces
Merge branch 'master' of github.com:pierreganty/mist
Merge pull request #4 from pevalme/master

Script to automatically test the tool
resolved conflict
LGTM

Merge branch 'pevalme-timeout'
Merge branch 'master' of github.com:pierreganty/mist
Resolved conflict
Merge remote-tracking branch 'upstream/master'