quick init commit
changed ignores
Idea rm
Remove all the things
remove all the things
gayyyy
Restart
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