Refactored Logo :: 17:13 :: 2/6/2013

updating master