merge attempt 2

trying to complete the merge...added decimal support, moved Jen off to
seperate folder, added Music types to build out support for the Asp.Net
MVC tut's.