Merge pull request #3 from lyg830/myCamera

My camera
address conflict
address conflict
Merge pull request #4 from lyg830/myCamera

address conflict
Merge pull request #5 from MobileComputing2013/camera

camera bug fixed
Ability to search for 1 picture of a dog, and display it on screen
Merge pull request #6 from MobileComputing2013/Flickr

Ability to search for 1 picture of a dog, and display it on screen
updated gitignore to ignore .settings folder
Merge branch 'Flickr'
Merge pull request #7 from MobileComputing2013/Flickr

updated gitignore to ignore .settings folder
Removed the eclipse settings folder (this should be generated locally)
Merge branch 'master' of https://github.com/MobileComputing2013/NewSeenIt
Load and show multiple pictures...still of dogs.
Merge branch 'Flickr'
Showing series of pictures on the screen. Still need to click and
visualize selected picture.
Images search and load complete. Both need lots of revamping but they
work well.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
Camera bug fixed
Merge pull request #9 from lyg830/master

Camera bugs Fixed
merged eduardos instagram stuff