Merge remote-tracking branch 'origin/Marek'
back button added
changed a port number
Merge remote-tracking branch 'origin/Smaranda'
Merge remote-tracking branch 'origin/Marek'
finished Bonus II