shakira

hips don't lie (i did the undergraduate classes and graduate classes)
and i'm starting to feel ya now
Merge remote-tracking branch 'origin/master'

Conflicts:

	MVCProject/MVCProject/obj/Debug/MVCProject.csprojResolveAssemblyReference.cache