# Updated FilePreProcessor.cs, FileProcessorTests.cs and RoslynScriptDebuggerEngine.cs to add #line directives after #loads
# Deleted DebugFilePreProcessor.cs. No longer needed with support for debugging in VS
Merge branch 'dev' of github.com:filipw/scriptcs into issue71

Conflicts:
	src/ScriptCs.Core/DebugFilePreProcessor.cs
	src/ScriptCs.Core/FilePreProcessor.cs
	test/ScriptCs.Core.Tests/FileProcessorTests.cs
Merge branch 'regbuilder' into issue71
Added error messages with line number when using -debug in console
Merge pull request #108 from dschenkelman/issue71

Issues #71 and #104