fixed scaling problems
Merge branch 'master' into psuedo_master
basic implementation of foodsuggestion class
Merge branch 'master' into psuedo_master
minor changes
Merge branch 'master' into psuedo_master
added new history fragment
added new history fragment
fixes to latest push
Merge branch 'master' into psuedo_master

Conflicts:
	src/com/innutrac/poly/innutrac/MainActivity.java
merge fix
Merge branch 'psuedo_master'