crap
Merge branch 'master' of https://github.com/jsduren/dev-projects

Conflicts:
	LibraryProject/LibraryProject/File.cs