comments
Merge branch 'master' of https://github.com/gallonp/GiambiAndroid

Conflicts:
	src/com/example/giambi/MainActivity.java
merge