hehe
Merge branch 'master' of github.com:ylang/18-641Java

Conflicts:
	SmartGallery/src/com/ece/smartGallery/activity/DisplayActivity.java