add
Merge branch 'master' of https://github.com/mii5656/MobileConputing.git

Conflicts:
	ScrambledEgg/bin/classes/jp/ac/ritsumei/scrambledegg/MainActivity.class