Created blank ChallengeActivity
Adding ChallengeActivity files
Merge branch 'master' of https://github.com/Jeffsul/RiskApp

Conflicts:
	gen/com/jeffsul/riskapp/R.java
Adding /gen to .gitignore