Merge branch 'master' of github.com:jbbrokaw/telephone-project
Merge branch 'master' of github.com:jbbrokaw/telephone-project
Merge branch 'master' of github.com:jbbrokaw/telephone-project into bugfixing
Fixes no-text error, adds link to header, cleans up login page
Merge pull request #18 from jbbrokaw/bugfixing

Bugfixing