Merge pull request #3 from mtabor150/master

removing the file recursion
dumb commit
attempting to convert changes on upstream repo to local repo
added some new windows to the app.
deleted unnecessary file
Merge pull request #4 from pmarti28/branch_add_game_functionality

Branch add game functionality
deleted a nested file. (figured this out from my biggest mistake so far). I have no idea why this keeps happening
Merge pull request #5 from pmarti28/branch_add_game_functionality

deleted a nested file. (figured this out from my biggest mistake so far)...
Merge pull request #10 from pmarti28/master

Added More game functionality
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