Added Activities
Merge remote-tracking branch 'origin/Mirosta'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/com/specieshack/biologything/MainActivity.class
	bin/classes/com/specieshack/biologything/R$attr.class
	bin/classes/com/specieshack/biologything/R$drawable.class
	bin/classes/com/specieshack/biologything/R$id.class
	bin/classes/com/specieshack/biologything/R$layout.class
	bin/classes/com/specieshack/biologything/R$menu.class
	bin/classes/com/specieshack/biologything/R$string.class
	bin/classes/com/specieshack/biologything/R$style.class
	bin/classes/com/specieshack/biologything/R.class
	gen/com/specieshack/biologything/R.java
Merge
Merge
Random
Merge branch 'megaak' of https://github.com/Mirosta/BiologyThing into megaak

Conflicts:
	AndroidManifest.xml
	project.properties
	res/layout/activity_main.xml
	res/values/strings.xml
	src/com/specieshack/biologything/MainActivity.java
	src/com/specieshack/biologything/SpeciesAdder.java