fixed a few bugs. day 1 progress done
Merge pull request #6 from fence-lizards-2014/TOMATO

fixed a few bugs. day 1 progress done