initial commit
merge conflict
merged master, fixed conflicts, working on main splash