dfget
Merge branch 'master' of https://github.com/larsmh/YSMB
Merge branch 'master' of https://github.com/larsmh/YSMB
Merge branch 'master' of https://github.com/larsmh/YSMB
add window size in a Constant class
Merge branch 'master' of https://github.com/larsmh/YSMB

Conflicts:
	bin/classes/com/tdt4240/yousunkmybattleship/MainActivity.class
add window size in a Constant class
Merge branch 'master' of https://github.com/larsmh/YSMB
Merge branch 'master' of https://github.com/larsmh/YSMB

Conflicts:
	bin/classes/com/tdt4240/yousunkmybattleship/Constants.class
	bin/classes/com/tdt4240/yousunkmybattleship/MainActivity.class
	src/com/tdt4240/yousunkmybattleship/Constants.java
	src/com/tdt4240/yousunkmybattleship/MainActivity.java