Signed-off-by: cray0114 <cray0114@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	realmemory/bin/classes.dex
	realmemory/bin/classes/com/example/realmemory/MainActivity.class
	realmemory/bin/dexedLibs/actionbarsherlock-ca44dbf811f24030e2f32259098d1b4a.jar
	realmemory/bin/dexedLibs/library-46f588a24f80fb4209ccff91f9950ec0.jar
	realmemory/bin/realmemory.apk
	realmemory/bin/resources.ap_


Signed-off-by: cray0114 <cray0114@gmail.com>