initial commit
Merge https://github.com/swiftsword94/project