badge criteria implementation
updated bootstrp
Merge branch 'master' of github.com:surevine/neon