full

1.0
Merge branch 'master' of https://github.com/mixky/web

Conflicts:
	index.html