address conflict
address conflict
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
merged eduardos instagram stuff
Merge branch 'master' of https://github.com/MobileComputing2013/NewSeenIt
Camera preview Layout change
Merge pull request #10 from lyg830/master

Camera preview Layout change
Update ImageCaptureFragment.java
Merge remote-tracking branch 'upstream/master'
update camera
Merge pull request #11 from lyg830/master

update camera
update camera

bugs fixed & flash added
update camera
Merge pull request #12 from lyg830/master

Update Camera
camera update