fixed.

z
Merge branch 'master' of https://github.com/entheme/cmu2014-warehouse
Merge branch 'master' of https://github.com/entheme/cmu2014-warehouse