添加忽略文件
Merge branch 'master' of https://github.com/opensourceBrown/DR

Conflicts:
	.gitignore

DR/projects/DRGame/proj.ios/DRGame.xcodeproj/xcuserdata/magic.xcuserdata
d/xcdebugger/Breakpoints_v2.xcbkptlist