initial setup check
Merge branch 'master' of https://github.com/CISC181/PS1.git