?
Merge branch 'master' of https://github.com/quinceftw/quinceftw.github.io
?
Conflicts:
	index.html