hopefully this doesn't break anything
Merge branch 'master' of https://github.com/sethmerriss/cecs475webproject

Conflicts:
	Bug2Bug/Bug2Bug/App_Data/aspnet-Bug2Bug-20130808124841.mdf
	Bug2Bug/Bug2Bug/App_Data/aspnet-Bug2Bug-20130808124841_log.ldf
	Bug2Bug/Bug2Bug/Site.Master.designer.cs
	Bug2Bug/Bug2Bug/bin/Bug2Bug.dll
	Bug2Bug/Bug2Bug/bin/Bug2Bug.pdb
	Bug2Bug/Bug2Bug/obj/Debug/Bug2Bug.csproj.FileListAbsolute.txt
	Bug2Bug/Bug2Bug/obj/Debug/Bug2Bug.csprojResolveAssemblyReference.cache
	Bug2Bug/Bug2Bug/obj/Debug/Bug2Bug.dll
	Bug2Bug/Bug2Bug/obj/Debug/Bug2Bug.pdb

	Bug2Bug/Bug2Bug/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache