changed cardsfragment
Remove the now ignored directory "bin"
Merge branch 'master' into psuedo_master
merge fix MainActivity
added new resources
Merge branch 'master' into psuedo_master

Conflicts:
	src/com/innutrac/poly/innutrac/MainActivity.java
merge fix MainActivity
fixed crash when click on skip button, edit the serving size and the chol and sodium from mg to g
removed bin and gen
Merge branch 'psuedo_master'
uncommented time block
Merge branch 'master' into psuedo_master
added bargraph and updated somethings
Merge branch 'psuedo_master'
Added basic implementation of exercise fragment.

Calories burned are calculated with a formula (some factor * user weight
* time)
calories burned are subtracted from the current calories count
Updated Nutrient DB

Updated DB to include saturated and unsaturated fat. Total fat removed.
Merge branch 'ChrisBranch'
Revert "Updated Nutrient DB"

This reverts commit 014755146222bd900b93e313e18d101981d33766.
Updated Nutrients DB

Added saturated and unsaturated fats data. Removed total fats.
Merge branch 'ChrisBranch'