[UPDATE] Cleaning up a bit :)
Merge branch 'master' of https://github.com/DimTac/PumirProject

Conflicts:
	css/style.css
	index.html
	panel-roue.html