updated login
Merge pull request #4 from temporizer/cristi

Cristi
merged
Merge branch 'master' of github.com:temporizer/ctec227-final
merged both