update my controlllersss
Merge branch 'master' of https://github.com/bogoroh/JungleStore

Conflicts:
	project2/views/affiliate1/header.ejs