Merge branch 'master' of C:\Users\Thomas\Android studioProjects\slidesnap with conflicts.
Test Commit
includes Camera operations
2nd try
Include swipe
Merge remote-tracking branch 'origin/master'
Code to see if we can go to a new activity after the picture has been taken.
Code for the image jumbling
includes login
login 2nd
login
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/edu/utexas/ee461l/slidesnap/MainActivity.java
Sends filepath to new activity. Calls Async task to upload file.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
Sends filepath to new activity. Calls Async task to upload file.
Sends filepath to new activity. Calls Async task to upload file.
IT WORKS...hopefully.