Updated my paramteers.yml
Merge branch 'master' of git://github.com/shaunthornburgh/pca

Conflicts:
	app/config/parameters.yml
	composer.lock
Fix merge conflict
Merge branch 'master' of git://github.com/shaunthornburgh/pca
git add
Change homepage headline