test
changed R.java
test123
remove R.java
Merge branch 'master' of https://github.com/ChrisViperZ/Minesweeper.git
Merge branch 'master' of https://github.com/ChrisViperZ/Minesweeper.git

Conflicts:
	src/com/example/minesweeper/GameActivity.java