This should work now
Merge branch 'master' of https://github.com/jojojangles/cis196