Git Ignore Stu's Codekit
Merge branch 'refs/heads/master' into gh-pages
Merge branch 'gh-pages' of github.com:MCooke/chessington into gh-pages
Git Ignore Stu's Codekit sass cache
.DS_Store removed from repository
Merge branch 'gh-pages' of github.com:MCooke/chessington into gh-pages
Merge branch 'gh-pages' of github.com:MCooke/chessington into gh-pages

Conflicts:
	.gitignore
Merge branch 'gh-pages' of github.com:MCooke/chessington into gh-pages