Created a new class for drawing graphics on a canvas. Tried to merge this with previous code but faced problems I need help to solve.
new try on the canvas
Few tries on touchcontrollers
new pic
Changed xml file and tried to fix ontouch on canvas, but messed it all up
testing ImageButton
Ibuttons created
added energy feature
bars added and funktional (but ugly..)
expressions try one
first fix of expressions
not completed graphics
merge fix
fix some bugs
added progressbarcolor
Merge remote-tracking branch 'origin/Dev' into notification

Conflicts:
	CrayCray/src/se/chalmers/dat255/craycray/MainActivity.java
	CrayCray/src/se/chalmers/dat255/craycray/model/NeedsModel.java