Merge branch 'master' of C:\Users\vivi dimitris\Desktop\CineMetroWithGit with conflicts.
Merge remote-tracking branch 'origin/master'
Changes in LinesActivity
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/activity_main_menu.xml