added files
Merge branch 'working_files' of https://github.com/LegoShrimp/hackathon into merger