dumb commit
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
changed UI to be more fitting with what we want
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 branch 'master' of https://github.com/pmarti28/CampusCreatures into pmarti28-master

Conflicts:
	bin/CampusCreatures.apk
	bin/MainActivity.apk
	bin/classes.dex
	bin/resources.ap_