Initial Commit
Fixes initial commit merge conflicts with Github