bar and stuff
Merge branch 'master' of https://github.com/meet-projects/nobs-y3-2014
Merge branch 'master' of https://github.com/meet-projects/nobs-y3-2014