commit
Merge branch 'master' of https://github.com/franck2/OneMoreMinute.git

Conflicts:
	war/css/style.css