Initial commit
Merge https://github.com/xBwomp/first_project