add
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
camera bug fixed
Merge pull request #3 from lyg830/myCamera

My camera
address conflict
address conflict
address conflict
Update org.eclipse.jdt.core.prefs
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'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.settings/org.eclipse.jdt.core.prefs