just pack out for work
	modified:   .gitignore
	modified:   index.html
	modified:   style.css
Merge branch 'master' of https://github.com/kuntau/kuntau.org

Conflicts:
	index.html