Authentication work
Merge branch 'feature2'
Finishing touches
Merge branch 'master' of https://github.com/akalelkar/CSC694-Assessment
Merge pull request #65 from tmfroem/master

Donezo