.
Merge branch 'master' of https://github.com/yzheng624/Sirius-Eclipse

Conflicts:
	src/com/sirius/Memo.java