first commit

	.DS_Store
Merge branch 'master' of github.com:ctcampbell/chrisos