pulling
Merge branch 'master' of github.com:haiqvo/AndroidApp
Merge branch 'master' of github.com:haiqvo/AndroidApp
Merge branch 'master' of github.com:haiqvo/AndroidApp

ok
Merge branch 'master' of github.com:haiqvo/AndroidApp
ok
Merge branch 'master' of github.com:haiqvo/AndroidApp

Conflicts:
	src/com/example/hexpet/CreatureGenerator.java
stuff got done