cleaned up a bit
Merge D:/Users/Fleur/Documents/Visual Studio 2010/Projects/ShamosHoey