Moving some files up
Merge branch 'master' of https://github.com/darkheretic/COSC363

Merging to keep files consistent