trophy page.
Adding battery progress with your critter
Merge branch 'master' of 10.20.1.102:/Users/jennifernurse/Documents/Dev Work/nurture

Conflicts:
	assets/www/css/stylesheet.css
	assets/www/index.html
Updating trophies page.
Merge branch 'master' of 10.20.1.102:/Users/jennifernurse/Documents/Dev Work/nurture
Adding menu button functionality
Trophies page responsive updates.
Merge branch 'master' of 10.20.1.102:/Users/jennifernurse/Documents/Dev Work/nurture

Conflicts:
	assets/www/index.html
Adding forgotten assets
Adding correct images
Updates to status msg
Msg updates.
Super half assed points
Merge branch 'master' of 10.20.1.102:/Users/jennifernurse/Documents/Dev Work/nurture
final touches