Initial commit
gitignore
init commit - add function
Merge branch 'master' of https://github.com/elyseko/calculator-coffee-script
Updating readme, post preso updates
Init commit
Merge branch 'master' of https://github.com/elysek/wwc-interaction-example

Conflicts:
	.gitignore
	README.md