Revert "Revert "branch test""

This reverts commit dfeb10a12c7d75f92d4a702aa6ca1518d259f7a1.

Conflicts:
	src/com/example/bolt/MainActivity.java
Revert "Revert "Test""

This reverts commit fb5c41b51da54b20c669d7e5eecb300e0ba351c1.

Conflicts:
	src/com/example/bolt/MainActivity.java