Small ui
Merge remote-tracking branch 'origin/master'
changed the interface of the challenge page, not quite finished
Merge branch 'master' of https://github.com/jdrub/Treehood
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/hartfordlab/www/treehood/ServerManager.java
minor bug fix