Merge pull request #1 from ScrambledEgge101/master

Jason 1st Commit March 20, 2013
nOTHING changed, just need to switch branches