Added integration
Merge branch 'master' of https://github.com/PsichiX/JustIDS

Conflicts:
	src/com/PsichiX/JustIDS/MainActivity.java
Merge branch 'master' of https://github.com/PsichiX/JustIDS

Conflicts:
	src/com/PsichiX/JustIDS/GameState.java
	src/com/PsichiX/JustIDS/MainActivity.java