merging
config files recommitted for merge
Merge branch 'master' of https://github.com/borowsky333/cookbook

Conflicts:
	Cookbook/App_Data/aspnet-Cookbook-20130302154948.mdf
	Cookbook/App_Data/aspnet-Cookbook-20130302154948_log.ldf
	Cookbook/Web.Debug.config
	Cookbook/Web.Release.config
	Cookbook/Web.config