Beginning project
Fix merge conflicts