JOSH: this is a good point for fixing the security error
Merge branch 'master' of https://github.com/JoshuaDickerson/cs205-Final_Project