Merge branch 'master' of /home/victory/AndroidStudioProjects/android with conflicts.
Added LoginActivity