Merge pull request #2 from benk691/dev

Full merge of contributors code
added login
Merge pull request #3 from benk691/tmp

Resolved merge conflicts with all branches