IT WORKS...hopefully.
working code
Merge branch 'master' of https://github.com/lgomide/slidesnap

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/edu/utexas/ee461l/slidesnap/ContactsListActivity.java
	app/src/main/res/layout/activity_contacts_list.xml
	servlets/servlets.iml
Merge branch 'master' of https://github.com/lgomide/slidesnap

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/edu/utexas/ee461l/slidesnap/ContactsListActivity.java
	app/src/main/res/layout/activity_contacts_list.xml
	servlets/servlets.iml
Merge branch 'master' of https://github.com/lgomide/slidesnap

Conflicts:
	app/build.gradle
Merge remote-tracking branch 'origin/Kyle'

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/res/layout/activity_contacts_list.xml
Merge branch 'master' of https://github.com/lgomide/slidesnap

Conflicts:
	app/build.gradle