stuff
stuff
Created .gitignore
creating hits page dialogs
Merge remote-tracking branch 'origin/NewHitsPage' into dev
updated .gitignore
take 2 updated ignore
ftg h
New Relic Installed

Now we can get real time data from users like network infomation and
errors.
updated ignore
New Relic Installed
Merge branch 'New-Relic-Install' into dev
chooseOpponent

Made chooseOpponent dialog, and finished most of the hits page
Merge remote-tracking branch 'origin/NewHitsPage' into dev

Conflicts:
	MFA/bin/CompanyLogo.apk
	MFA/bin/classes.dex

MFA/bin/dexedLibs/android-support-v4-eb35932d149186f50f197e84ee68568b.ja
r
	MFA/bin/resources.ap_
	MFA/src/com/example/activities/HitsNew.java
.gitignore working now
idk what i did
Merge pull request #4 from UnbrandedTech/NewHitsPage

idk what i did
deleted
Merge branch 'NewHitsPage' into James_Test
Merge pull request #3 from UnbrandedTech/dev

Dev