.
Merge branch 'master' of https://github.com/fabrice123/JamesBond_FrontBack_time

Conflicts:
	.idea/workspace.xml
	www/css/customstyle.css
	www/css/customstyle.scss