dumb commit
cleaning
damn
Conflict resolution
Merge branch 'master' of https://github.com/mtabor150/CampusCreatures

Conflicts:
	bin/MainActivity.apk
	bin/resources.ap_
Merge branch 'master' of https://github.com/mtabor150/CampusCreatures

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/CampusCreatures/.indexes/e4/81/96/15/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/CampusCreatures/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
Created SQLite database helper and initilizer
changed UI to be more fitting with what we want
updated package name
Added location functions
Merge pull request #6 from pmarti28/feature_UI_Update

ui update
deleted unneeded file
Merge pull request #7 from pmarti28/feature_UI_Update

fixed some bs
Merge pull request #11 from mtabor150/init_creature

Init creature
Merge branch 'map' of https://github.com/PJDesi/CampusCreatures into PJDesi-map

Conflicts:
	bin/resources.ap_
Merge branch 'master' of https://github.com/pmarti28/CampusCreatures into pmarti28-master

Conflicts:
	bin/CampusCreatures.apk
	bin/MainActivity.apk
	bin/classes.dex
	bin/resources.ap_
updated map activity to display location with a button
Merge pull request #14 from mtabor150/map_button

updated map activity to display location with a button
Merge branch 'master' of https://github.com/mtabor150/CampusCreatures
Finalized MainActivity Layout
Created Temporarily Blank CreatureStats Activity
All activites linked together.