add borderStyle argument to createStyle
git sync error

Merge branch 'master' of https://github.com/awalker89/openxlsx

Conflicts:
	R/wrappers.R