travis 설정 변경
Merge branch 'master' of https://github.com/an0a/pages

Conflicts:
	.travis.yml