New flat-ui bootstrap
Starting html views
Merge branch 'master' of https://github.com/visd/VISD-Badges

* 'master' of https://github.com/visd/VISD-Badges:
  Added template, renamed existing
  Added view and sample context for /challenge/:id

Conflicts:
	badges/templates/base.html
Acidentally ignored