Added new Animations
Merge branch 'master' of https://github.com/aehernandez/Lifemeter

Conflicts:
	gen/com/example/Lifemeter/R.java
	res/layout/home.xml
	src/com/example/Lifemeter/Data.java
	src/com/example/Lifemeter/Lifemeter.java