file structure set up
fix merge conflicts
Merge branch 'master' of https://github.com/JKiely/GitHub-Profiles-Angular-

.
fix merge conflicts
Add test environment
...
Merge branch 'master' of github.com:ralake/angular_github_search