First commit. Adding all files so they can be managed easier.
Fixing merge conflicts