stop the changes! :(
Merge branch 'master' of https://github.com/calvinmm/hack-rice-2014