- testing build stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build.gradle
Merge branch 'master' of https://github.com/a00880208/Android3717Project1
Created the code needed to pass a list of URLs and then parse them and display them
Created the function to go back and forth in the images from the url