UI Commit
Merge remote-tracking branch 'origin/master'
Login Initial
Some Controller before UI in
UI in
UI in

Conflicts:
	app/src/main/res/layout/fragment_home.xml
Merge remote-tracking branch 'origin/Controller' into Controller

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
Login being added
Login being added
Merge remote-tracking branch 'origin/Controller' into Controller

Conflicts:
	app/build.gradle
	app/src/main/res/layout/activity_login.xml
Some Controller before UI in
Merge remote-tracking branch 'origin/master' into Controller

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/tweny1/ListViewActivity.java
	app/src/main/res/layout/fragment_list_view.xml
	app/src/main/res/values/strings.xml
Some Controller before UI in