Second commit
Merge branch 'master' of https://github.com/deniederhut/Psych-101-Fall-2014