added files
working http request
Merge branch 'working_files' of https://github.com/LegoShrimp/hackathon into merger
Fixed merge conflicts