New Images and Text from Derek
Merge branch 'master' of https://github.com/jesserbyars/Cigarette

Conflicts:
	index.php