Fixed major conflicts, adding admin to master