Test

trying to see if I can make files locally
Test 2

this might be working
Fixed shit
Merge branch 'Daniel's-Comp'

Conflicts:
	.DS_Store
	.project
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/cs2340/andriod/cs_2340_water_s_warrioirs/R$id.class
	bin/classes/cs2340/andriod/cs_2340_water_s_warrioirs/R$string.class
	bin/classes/cs2340/andriod/cs_2340_water_s_warriors/R$id.class
	bin/classes/cs2340/andriod/cs_2340_water_s_warriors/R$string.class
	bin/classes/cs2340/android/.DS_Store
	bin/classes/cs2340/android/Model/User.class
	bin/classes/cs2340/android/Presenters/IntroPagePresenter.class
	bin/classes/cs2340/android/Presenters/RegPagePresenter.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/BuildConfig.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/R$attr.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/R$color.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/R$dimen.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/R$drawable.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/R$id.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/R$layout.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/R$menu.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/R$string.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/R$style.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/R$styleable.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/R.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/util/SystemUiHider$1.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/util/SystemUiHider$OnVisibilityChangeListener.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/util/SystemUiHider.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/util/SystemUiHiderBase.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/util/SystemUiHiderHoneycomb$1.class
	bin/classes/cs2340/android/cs_2340_water_s_warrioirs/util/SystemUiHiderHoneycomb.class
	gen/cs2340/andriod/cs_2340_water_s_warrioirs/BuildConfig.java
	gen/cs2340/andriod/cs_2340_water_s_warrioirs/R.java
	gen/cs2340/andriod/cs_2340_water_s_warriors/BuildConfig.java
	gen/cs2340/andriod/cs_2340_water_s_warriors/R.java
	gen/cs2340/android/cs_2340_water_s_warriors/BuildConfig.java
	gen/cs2340/android/cs_2340_water_s_warriors/R.java
	src/cs2340/android/.DS_Store
	src/cs2340/android/Activities/FullscreenActivity.java
	src/cs2340/android/Activities/LoginActivity.java
	src/cs2340/android/Activities/RegisterActivity.java
	src/cs2340/android/Activities/SucessActivity.java
	src/cs2340/android/Presenters/IntroPagePresenter.java
	src/cs2340/android/Presenters/RegPagePresenter.java
	src/cs2340/android/cs_2340_water_s_warriors/util/SystemUiHider.java
	src/cs2340/android/cs_2340_water_s_warriors/util/SystemUiHiderBase.java
	src/cs2340/android/cs_2340_water_s_warriors/util/SystemUiHiderHoneycomb.java