Fix bug #79 and add functionnality #80
Merge branch 'master' of https://github.com/vtriquet/Matching-fruits--

Conflicts:
	css/app.css