Can't predict the future
maintenant on a des pandas!!
Merge branch 'githubPanda/lastBoink'

Conflicts:
	src/com/example/kilopanda/MainActivity.java