honour the contributor
name
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/claudehohl/Stikked.git
Merge branch 'master' of https://github.com/claudehohl/Stikked.git
Make these directives more platform independent
Merge pull request #99 from ch0wnag3/master

Improvement for .htaccess
Merge branch 'master' of https://github.com/claudehohl/Stikked