Added Batman
Merge branch 'master' of https://github.com/nebomusic/375Fall14Team1
Merge branch 'master' of https://github.com/nebomusic/375Fall14Team1
added CalorieCounter