asdf
Merge branch 'master' of https://github.com/tylercd100/garden

Conflicts:
	app/database/migrations/2013_11_03_004116_create_conditions_table.php