added some functions to sheep.py and ram.py
uncommented out some stuff in those functions
Working more with sheep
Merge remote-tracking branch 'jon/master'