Merge branch 'master' of https://github.com/seren-vox/Astroworld.co.za

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/Astroworld.co.za/.indexes/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Astroworld.co.za/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Astroworld.co.za/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.snap
	how_to_buy.html

Signed-off-by: Seren Singh <serens@voxtelecom.co.za>