Added Cucumber Tests
/Nonfunctional login
Passes Cucumber Tests
Fixed merge conflicts from Ronde.