Working on the black box
Merge branch 'master' of https://github.com/kishandchips/ivip

Conflicts:
	functions.php