ignore annoying stuff
Merge branch 'master' of github.com:colinsheppard/insalmo-instream-gui