Closes Issue#130, can now log in using either email or username at both locations.

[nathangavin]

Closes issue #130.

Changes made to the App include changing the placeholder text in the username section of both the main login screen and the inline login screen in the top right of the app. the functionality of the app allowed for users to use either their GitHub username or associated email address to log in. Now both log in places' reflect this functionality, with the placeholder text stating "Username or Email" at both places. Also, the username input area for the inline login screen has been made wider, to more comfortably accommodate email addresses, if the user wishes to use one.

files changed:

• app/components/header.component.ts
• app/components/authenticate.component.ts

[Scoobster]

@softeng-701 tagging for approval and merge

[softeng-701]

@nathangavin @Scoobster Please squash your commits before the deadline. Also, make sure all group members have given their reviews. Thanks

[nathangavin]

@softeng-701 Commits have been squashed, but for some reason the old commits are still showing. All group members have approved the code.

[softeng-701]

@nathangavin We have been asked to merge PR's with 1 or 2 commits, right now you still have 31. If you have time please look at this

[nathangavin]

@softeng-701 for some reason the commits will not squash together. I used the same technique i had before, but its simply not registering.

[softeng-701]

@nathangavin This is a pretty small change, perhaps make a new branch off master and copy your changes into that. Then submit a new PR. Up to you. Cheers

[nathangavin]

@softeng-701 running the command "git rebase -i HEAD~10" tries to rebase 82 commits, instead of the 10 i request.

[nathangavin]

created a new pull request for this issue.

[softeng-701]

@nathangavin So we can close this one?