Merge branch 'master' of https://github.com/Notulp/Pluton

Conflicts:
	Pluton.Patcher/Program.cs
	Pluton/Bootstrap.cs
	Pluton/Pluton.csproj