Begin manual integration of master into track2 due to Storyboard conflicts that cannot be automerged / Add login function / Connect to database