Added LoginActivity

Also testing branching and merging