Just commiting some changes
Merge branch 'master' of https://github.com/MemoryGame/UCDproject.git

Conflicts:
	MemoryGame/bin/MemoryGame.apk
	MemoryGame/bin/classes.dex
	MemoryGame/bin/jarlist.cache
Trying to fix my local ActionBarSerlock
Another commit - just trying to get ActionbarSherlock working
More commits
commit 16:25
commit 16:46
commit 16:46
commit 16:52
Button colour - there all blue for nom