whoo more changes to be made
Merge branch 'master' of https://github.com/nothingatall544/CardsAgainstAgility

Conflicts:
	CardsAgainstAgility/src/com/adaba/activities/GameListActivity.java
small changes to .gitignore
more changes
Merge branch 'master' of https://github.com/nothingatall544/CardsAgainstAgility