new pix
Merge branch 'master' of https://github.com/axelhildingson/groupName1

Conflicts:
	gen/com/example/groupname/R.java
	res/animator/tubeanimation.xml
	res/drawable-hdpi/testtubefadein.png
	res/drawable-hdpi/testtubefinnished.png
	res/drawable-hdpi/testtubestart.png