Remove files on error
Merge branch 'master' into gh-pages

Conflicts:
	deploy.sh
Remove files variable & 'git commit -a' on merge error
Merge branch 'master' into gh-pages

Conflicts:
	deploy.sh