Forcing me to commit binary files before syncing

This shouldn't be happening - I had fixed this yesterday.  We need to
fix it so git ignores binaries.
Merge branch 'master' of https://github.com/JEMMtastic/CapstoneCharity

Conflicts:
	Capstone/Capstone.WebUI/App_Data/Capstone.mdf
	Capstone/Capstone.WebUI/App_Data/Capstone_log.ldf