new pull

	modified:   .gitignore
	new file:   LICENSE.md
	modified:   bower.json
	modified:   index.html
	new file:   lic
	new file:   script.coffee
	new file:   script.js
	new file:   server.coffee
	new file:   stacks.json
	modified:   style.css
Merge branch 'master' of https://github.com/kuntau/kuntau.org

Conflicts:
	.gitignore

	modified:   .gitignore
	new file:   Gruntfile.coffee
	modified:   index.html
	new file:   package.json
	new file:   style.styl