Merge branch 'master' of https://github.com/Chenyijun/hackcmu2014
Merge branch 'master' of https://github.com/maggieli321/hackcmu2014
ehh
pulled from sangha