fixed formatting for historyfragment
Merge branch 'master' into psuedo_master
Merge branch 'master' into psuedo_master

Conflicts:
	src/com/innutrac/poly/innutrac/FoodSuggestion.java
super basic recommendation filler implemented and fixes for historyfragment
Merge branch 'master' into psuedo_master

Conflicts:
	src/com/innutrac/poly/innutrac/FoodSuggestion.java
Line Graph working, i add a condition to your

filter method in case the the query return back an empty list
merge fix
Merge branch 'psuedo_master' of https://github.com/thomt/Innutrac into psuedo_master

Conflicts:
	src/com/innutrac/poly/innutrac/PercentCard.java
fixed bounds problem for for loop
fixed negative value results from foodsuggestion limit
Merge branch 'psuedo_master'