stupid bug
Merge branch 'local' of github.com:bootstrapworld/wescheme2012 into local