somehow changing css twice didn't work, so preparing the css-options before actually applying it to the target
Merge branch 'border-box' of github.com:murb/ScrollToFixed into border-box

Conflicts:
	jquery-scrolltofixed.js