Omg Mike is a jerk
green bar is 2 buttons now
working timeline for exercises
Merge remote-tracking branch 'upstream/master'
launcher icon changes
Merge branch 'master' of https://github.com/jaypoulz/DoDHackathon2013
fixed calculations for nutritional needs
Disabling main UI buttons, no crash on exit log foods
Merge remote-tracking branch 'upstream/master'