showing derek how to commit code
brigit testing pull request
Merge pull request #2 from alexamster/test_branch2

showing derek how to commit code
Merge pull request #3 from alexamster/bridger-test

brigit testing pull request
Merge branch 'master' into derek_test

Conflicts:
	climbz/src/com/dab/climbz/MainActivity.java