changes for cross-platform compatbility
Merge branch 'master' of https://github.com/SJBertsch/Team5Project
Saved changes for cross-platform compatibility