include stylesheets
Merge branch 'master' of https://github.com/thfield/calculator

Conflicts:
	.gitignore
add gitignore
Merge branch 'master' of https://github.com/thfield/calculator

Conflicts:
	.gitignore
.gitignore issues
gitignore continues