merge 7-3-13

added in hunnerds ae shite