urm
things

Merge branch 'master' of github.com:richard-1990/rich.ardpric.es

Conflicts:
	ource/index.php
Merge branch 'master' of github.com:richard-1990/rich.ardpric.es
Merge branch 'master' of github.com:richard-1990/rich.ardpric.es
Merge branch 'master' of github.com:richard-1990/rich.ardpric.es
Merge branch 'master' of github.com:richard-1990/rich.ardpric.es
Merge branch 'master' of github.com:richard-1990/rich.ardpric.es
Merge branch 'master' of github.com:richard-1990/rich.ardpric.es