started working on ad stuff
finished adding ad stuff
Merge branch 'master' into ad_campaign
oops wasnt dont
added money
resolved mergeconflict with phil now i have ad stuff and code stuff
FINALLY DONE AD CAMPGIN