useless commit
Merge branch 'master' of https://github.com/Kevin445/colinePortfolio

Conflicts:
	.DS_Store
targeted smoothscroll