first test commit
Test GitHub support in IDE
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Beginning of the fragments
Beginning of the fragments
Merge remote-tracking branch 'origin/master'
Beginning of the fragments
Menu Development
Update README.md
Menu Development
Fragment experiments
Fragment experiments
Fragment experiments
Fragment experiments
SQLite completed
Merge branch 'fragment' into master-with-saves2

Conflicts:
	res/layout/activity_game.xml
	src/com/github/mcfeod/robots4droid/Board.java
	src/com/github/mcfeod/robots4droid/GameActivity.java
	src/com/github/mcfeod/robots4droid/MainActivity.java
	src/com/github/mcfeod/robots4droid/Player.java
Merge branch 'fragment' into master-with-saves
Saves added.
Merge branch 'ex-master' into master-with-saves2

Conflicts:
	res/layout/activity_settings.xml
	src/com/github/mcfeod/robots4droid/DrawWorld.java
	src/com/github/mcfeod/robots4droid/GameActivity.java
	src/com/github/mcfeod/robots4droid/MainActivity.java
	src/com/github/mcfeod/robots4droid/SettingsActivity.java
	src/com/github/mcfeod/robots4droid/SettingsParser.java
	src/com/github/mcfeod/robots4droid/World.java
Merge branch 'fragment' into master-with-saves
Saves added.
Update README.md