conflit git
Merge branch 'master' of https://github.com/relefebvre/cineDome

Conflicts:
	cineDome/bin/Main.class
	cineDome/bin/Menu.class
	cineDome/bin/Vue.class