OOP delete, fixed up undo for add
Merge remote-tracking branch 'origin/master'

Conflicts:
	BoxIn/BoxIn/BoxIn.vcxproj.filters
	BoxIn/BoxIn/parser.cpp
	BoxIn/BoxIn/parser.h
Merge remote-tracking branch 'origin/master'

Conflicts:
	BoxIn/BoxIn/BoxIn.vcxproj.filters
	BoxIn/BoxIn/parser.cpp
	BoxIn/BoxIn/parser.h