Having trouble pulling "Checkout Conflict" so committing first before
second try
Merge branch 'master' of
https://github.com/manicwombat/turnitup-beta.git

Conflicts:
	TurnItUpBeta/src/com/need2/turnitup/beta/MainActivity.java
x