Getting merge difficulties ironed out

I always have troubles with these at work too :)
Resolving conflicts.
Merge branch 'master' of https://github.com/crazydavises/Plantopia

Conflicts:
	plantopia.php