-n 
deploy
-n 
Merge commit 'de7494332def708d0385ccfb3cff057b67e6b96c'

Conflicts:
	dist/cv/index.html
	dist/index.html
-n 
kill old file