second try
Merge branch 'master' of
https://github.com/huynhnguyen/contextStorage.git

Conflicts:
	bin/classes/com/example/contextstorage/MainActivity.class
	src/com/example/contextstorage/MainActivity.java