condition table stuff
Merge branch 'master' of https://github.com/tylercd100/garden

Conflicts:
	app/database/seeds/ConditionTableSeeder.php