proton 2016-06-24

thanks! I'll review in a bit 🙂

it's always difficult to say what to add to the gitignore vs global_gitignore

@occamin has joined the channel