commit
commit
commit
commit

added calc app
commit
Merge branch 'gh-pages'

Conflicts:
	config.codekit
Merge pull request #1 from rdbrdd/master

merge