123
Merge branch 'master' of https://github.com/cloudFinal/CloudFinalProject.git
1
Merge branch 'master' of
https://github.com/cloudFinal/CloudFinalProject.git

Conflicts:
	src/beans/Preference.java
Merge branch 'master' of https://github.com/cloudFinal/CloudFinalProject.git
1
Merge branch 'master' of https://github.com/cloudFinal/CloudFinalProject.git
123