updatemylocal

...
01
02
03
Merge branch 'master' of https://github.com/CrocusJava/battleofrotterdam

Conflicts:
	front/public_html/css/mystyle.css
	front/public_html/index.html