Added multi user support for the termini app
Added multi-user support and comments for log entries
Merge conflict resolved
Merge branch 'Narayanan170-master'