lots of changes
ahhhhhhh
Merge branch 'master' of github.com:calvinmm/hack-rice-2014